diff --git a/addons/account/account.py b/addons/account/account.py
index 1d3b9b0dc4d..329ae2579e2 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -30,7 +30,7 @@ from osv import fields, osv
 import decimal_precision as dp
 from tools.translate import _
 
-def check_cycle(self, cr, uid, ids):
+def check_cycle(self, cr, uid, ids, context=None):
     """ climbs the ``self._table.parent_id`` chains for 100 levels or
     until it can't find any more parent(s)
 
@@ -116,7 +116,7 @@ class account_payment_term_line(osv.osv):
     _order = "sequence"
 
     def _check_percent(self, cr, uid, ids, context=None):
-        obj = self.browse(cr, uid, ids[0])
+        obj = self.browse(cr, uid, ids[0], context=context)
         if obj.value == 'procent' and ( obj.value_amount < 0.0 or obj.value_amount > 1.0):
             return False
         return True
@@ -194,7 +194,7 @@ class account_account(osv.osv):
                 if not args[pos][2]:
                     del args[pos]
                     continue
-                jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2])
+                jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2], context=context)
                 if (not (jour.account_control_ids or jour.type_control_ids)) or not args[pos][2]:
                     args[pos] = ('type','not in',('consolidation','view'))
                     continue
@@ -207,7 +207,7 @@ class account_account(osv.osv):
         if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
             ids = super(account_account, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
-            for consolidate_child in self.browse(cr, uid, context['account_id']).child_consol_ids:
+            for consolidate_child in self.browse(cr, uid, context['account_id'], context=context).child_consol_ids:
                 ids.append(consolidate_child.id)
             return ids
 
@@ -215,8 +215,6 @@ class account_account(osv.osv):
                 order, context=context, count=count)
 
     def _get_children_and_consol(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         #this function search for all the children and all consolidated children (recursively) of the given account ids
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)], context=context)
         ids3 = []
@@ -309,15 +307,15 @@ class account_account(osv.osv):
                 res[id] = sums.get(id, null_result)
             return res
 
-    def _get_company_currency(self, cr, uid, ids, field_name, arg, context={}):
+    def _get_company_currency(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
-        for rec in self.browse(cr, uid, ids, context):
+        for rec in self.browse(cr, uid, ids, context=context):
             result[rec.id] = (rec.company_id.currency_id.id,rec.company_id.currency_id.symbol)
         return result
 
-    def _get_child_ids(self, cr, uid, ids, field_name, arg, context={}):
+    def _get_child_ids(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
-        for record in self.browse(cr, uid, ids, context):
+        for record in self.browse(cr, uid, ids, context=context):
             if record.child_parent_ids:
                 result[record.id] = [x.id for x in record.child_parent_ids]
             else:
@@ -330,9 +328,9 @@ class account_account(osv.osv):
 
         return result
 
-    def _get_level(self, cr, uid, ids, field_name, arg, context={}):
+    def _get_level(self, cr, uid, ids, field_name, arg, context=None):
         res={}
-        accounts = self.browse(cr, uid, ids)
+        accounts = self.browse(cr, uid, ids, context=context)
         for account in accounts:
             level = 0
             if account.parent_id:
@@ -396,8 +394,8 @@ class account_account(osv.osv):
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'account.account', context=c),
     }
 
-    def _check_recursion(self, cr, uid, ids):
-        obj_self = self.browse(cr, uid, ids[0])
+    def _check_recursion(self, cr, uid, ids, context=None):
+        obj_self = self.browse(cr, uid, ids[0], context=context)
         p_id = obj_self.parent_id and obj_self.parent_id.id
         if (obj_self in obj_self.child_consol_ids) or (p_id and (p_id is obj_self.id)):
             return False
@@ -426,14 +424,12 @@ class account_account(osv.osv):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []
-        if not context:
-            context = {}
         args = args[:]
         ids = []
         try:
             if name and str(name).startswith('partner:'):
                 part_id = int(name.split(':')[1])
-                part = self.pool.get('res.partner').browse(cr, user, part_id, context)
+                part = self.pool.get('res.partner').browse(cr, user, part_id, context=context)
                 args += [('id', 'in', (part.property_account_payable.id, part.property_account_receivable.id))]
                 name = False
             if name and str(name).startswith('type:'):
@@ -685,7 +681,7 @@ class account_journal(osv.osv):
 
         @return: Returns a list of tupples containing id, name
         """
-        result = self.browse(cr, user, ids, context)
+        result = self.browse(cr, user, ids, context=context)
         res = []
         for rs in result:
             name = rs.name
@@ -733,7 +729,7 @@ class account_journal(osv.osv):
             view_id = 'account_journal_bank_view_multi'
 
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=',view_id)])
-        data = obj_data.browse(cr, uid, data_id[0])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
 
         res.update({
             'centralisation':type == 'situation',
@@ -778,8 +774,8 @@ class account_fiscalyear(osv.osv):
                     return False
         return True
 
-    def _check_duration(self,cr,uid,ids):
-        obj_fy = self.browse(cr,uid,ids[0])
+    def _check_duration(self, cr, uid, ids, context=None):
+        obj_fy = self.browse(cr, uid, ids[0], context=context)
         if obj_fy.date_stop < obj_fy.date_start:
             return False
         return True
@@ -789,11 +785,11 @@ class account_fiscalyear(osv.osv):
         (_check_fiscal_year, 'Error! You cannot define overlapping fiscal years',['date_start', 'date_stop'])
     ]
 
-    def create_period3(self,cr, uid, ids, context={}):
+    def create_period3(self,cr, uid, ids, context=None):
         return self.create_period(cr, uid, ids, context, 3)
 
-    def create_period(self,cr, uid, ids, context={}, interval=1):
-        for fy in self.browse(cr, uid, ids, context):
+    def create_period(self,cr, uid, ids, context=None, interval=1):
+        for fy in self.browse(cr, uid, ids, context=context):
             ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
             while ds.strftime('%Y-%m-%d')<fy.date_stop:
                 de = ds + relativedelta(months=interval, days=-1)
@@ -811,7 +807,7 @@ class account_fiscalyear(osv.osv):
                 ds = ds + relativedelta(months=interval)
         return True
 
-    def find(self, cr, uid, dt=None, exception=True, context={}):
+    def find(self, cr, uid, dt=None, exception=True, context=None):
         if not dt:
             dt = time.strftime('%Y-%m-%d')
         ids = self.search(cr, uid, [('date_start', '<=', dt), ('date_stop', '>=', dt)])
@@ -856,14 +852,14 @@ class account_period(osv.osv):
     }
     _order = "date_start"
 
-    def _check_duration(self,cr,uid,ids,context={}):
-        obj_period=self.browse(cr,uid,ids[0])
+    def _check_duration(self,cr,uid,ids,context=None):
+        obj_period = self.browse(cr, uid, ids[0], context=context)
         if obj_period.date_stop < obj_period.date_start:
             return False
         return True
 
-    def _check_year_limit(self,cr,uid,ids,context={}):
-        for obj_period in self.browse(cr,uid,ids):
+    def _check_year_limit(self,cr,uid,ids,context=None):
+        for obj_period in self.browse(cr, uid, ids, context=context):
             if obj_period.special:
                 continue
 
@@ -884,13 +880,13 @@ class account_period(osv.osv):
         (_check_year_limit, 'Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. ', ['date_stop'])
     ]
 
-    def next(self, cr, uid, period, step, context={}):
+    def next(self, cr, uid, period, step, context=None):
         ids = self.search(cr, uid, [('date_start','>',period.date_start)])
         if len(ids)>=step:
             return ids[step-1]
         return False
 
-    def find(self, cr, uid, dt=None, context={}):
+    def find(self, cr, uid, dt=None, context=None):
         if not dt:
             dt = time.strftime('%Y-%m-%d')
 #CHECKME: shouldn't we check the state of the period?
@@ -906,7 +902,7 @@ class account_period(osv.osv):
             cr.execute('update account_period set state=%s where id=%s', (mode, id))
         return True
 
-    def name_search(self, cr, user, name, args=None, operator='ilike', context={}, limit=80):
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if args is None:
             args = []
         if context is None:
@@ -918,7 +914,7 @@ class account_period(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         if 'company_id' in vals:
             move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
             if move_lines:
@@ -944,7 +940,7 @@ class account_journal_period(osv.osv):
     _name = "account.journal.period"
     _description = "Journal Period"
 
-    def _icon_get(self, cr, uid, ids, field_name, arg=None, context={}):
+    def _icon_get(self, cr, uid, ids, field_name, arg=None, context=None):
         result = {}.fromkeys(ids, 'STOCK_NEW')
         for r in self.read(cr, uid, ids, ['state']):
             result[r['id']] = {
@@ -966,28 +962,28 @@ class account_journal_period(osv.osv):
         'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company')
     }
 
-    def _check(self, cr, uid, ids, context={}):
-        for obj in self.browse(cr, uid, ids, context):
+    def _check(self, cr, uid, ids, context=None):
+        for obj in self.browse(cr, uid, ids, context=context):
             cr.execute('select * from account_move_line where journal_id=%s and period_id=%s limit 1', (obj.journal_id.id, obj.period_id.id))
             res = cr.fetchall()
             if res:
                 raise osv.except_osv(_('Error !'), _('You can not modify/delete a journal with entries for this period !'))
         return True
 
-    def write(self, cr, uid, ids, vals, context={}):
-        self._check(cr, uid, ids, context)
-        return super(account_journal_period, self).write(cr, uid, ids, vals, context)
+    def write(self, cr, uid, ids, vals, context=None):
+        self._check(cr, uid, ids, context=context)
+        return super(account_journal_period, self).write(cr, uid, ids, vals, context=context)
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         period_id=vals.get('period_id',False)
         if period_id:
-            period = self.pool.get('account.period').browse(cr, uid,period_id)
+            period = self.pool.get('account.period').browse(cr, uid, period_id, context=context)
             vals['state']=period.state
         return super(account_journal_period, self).create(cr, uid, vals, context)
 
-    def unlink(self, cr, uid, ids, context={}):
-        self._check(cr, uid, ids, context)
-        return super(account_journal_period, self).unlink(cr, uid, ids, context)
+    def unlink(self, cr, uid, ids, context=None):
+        self._check(cr, uid, ids, context=context)
+        return super(account_journal_period, self).unlink(cr, uid, ids, context=context)
 
     _defaults = {
         'state': 'draft',
@@ -1038,8 +1034,6 @@ class account_move(osv.osv):
 
         if not args:
           args = []
-        if not context:
-          context = {}
         ids = []
         if name:
             ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context)
@@ -1058,7 +1052,7 @@ class account_move(osv.osv):
         if not ids:
             return []
         res = []
-        data_move = self.pool.get('account.move').browse(cursor,user,ids)
+        data_move = self.pool.get('account.move').browse(cursor, user, ids, context=context)
         for move in data_move:
             if move.state=='draft':
                 name = '*' + str(move.id)
@@ -1067,7 +1061,7 @@ class account_move(osv.osv):
             res.append((move.id, name))
         return res
 
-    def _get_period(self, cr, uid, context):
+    def _get_period(self, cr, uid, context=None):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
             return periods[0]
@@ -1128,8 +1122,8 @@ class account_move(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
 
-    def _check_centralisation(self, cursor, user, ids):
-        for move in self.browse(cursor, user, ids):
+    def _check_centralisation(self, cursor, user, ids, context=None):
+        for move in self.browse(cursor, user, ids, context=context):
             if move.journal_id.centralisation:
                 move_ids = self.search(cursor, user, [
                     ('period_id', '=', move.period_id.id),
@@ -1139,8 +1133,8 @@ class account_move(osv.osv):
                     return False
         return True
 
-    def _check_period_journal(self, cursor, user, ids):
-        for move in self.browse(cursor, user, ids):
+    def _check_period_journal(self, cursor, user, ids, context=None):
+        for move in self.browse(cursor, user, ids, context=context):
             for line in move.line_id:
                 if line.period_id.id != move.period_id.id:
                     return False
@@ -1166,7 +1160,7 @@ class account_move(osv.osv):
         if not valid_moves:
             raise osv.except_osv(_('Integrity Error !'), _('You cannot validate a non-balanced entry !\nMake sure you have configured Payment Term properly !\nIt should contain atleast one Payment Term Line with type "Balance" !'))
         obj_sequence = self.pool.get('ir.sequence')
-        for move in self.browse(cr, uid, valid_moves):
+        for move in self.browse(cr, uid, valid_moves, context=context):
             if move.name =='/':
                 new_name = False
                 journal = move.journal_id
@@ -1191,7 +1185,7 @@ class account_move(osv.osv):
         return True
 
     def button_validate(self, cursor, user, ids, context=None):
-        for move in self.browse(cursor, user, ids):
+        for move in self.browse(cursor, user, ids, context=context):
             top = None
             for line in move.line_id:
                 account = line.account_id
@@ -1204,8 +1198,8 @@ class account_move(osv.osv):
                     raise osv.except_osv(_('Error !'), _('You cannot validate a Journal Entry unless all journal items are in same chart of accounts !'))
         return self.post(cursor, user, ids, context=context)
 
-    def button_cancel(self, cr, uid, ids, context={}):
-        for line in self.browse(cr, uid, ids, context):
+    def button_cancel(self, cr, uid, ids, context=None):
+        for line in self.browse(cr, uid, ids, context=context):
             if not line.journal_id.update_posted:
                 raise osv.except_osv(_('Error !'), _('You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that.'))
         if ids:
@@ -1214,18 +1208,21 @@ class account_move(osv.osv):
                        'WHERE id IN %s', ('draft', tuple(ids),))
         return True
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
+        if context is None:
+            context = {}
         c = context.copy()
         c['novalidate'] = True
         result = super(osv.osv, self).write(cr, uid, ids, vals, c)
-        self.validate(cr, uid, ids, context)
+        self.validate(cr, uid, ids, context=context)
         return result
 
     #
     # TODO: Check if period is closed !
     #
     def create(self, cr, uid, vals, context=None):
-        context = context or {}
+        if context is None:
+            context = {}
         if 'line_id' in vals and context.get('copy'):
             for l in vals['line_id']:
                 if not l[0]:
@@ -1265,8 +1262,9 @@ class account_move(osv.osv):
             result = super(account_move, self).create(cr, uid, vals, context)
         return result
 
-    def copy(self, cr, uid, id, default={}, context={}):
-        context = context or {}
+    def copy(self, cr, uid, id, default={}, context=None):
+        if context is None:
+            context = {}
         default.update({
             'state':'draft',
             'name':'/',
@@ -1277,10 +1275,9 @@ class account_move(osv.osv):
         return super(account_move, self).copy(cr, uid, id, default, context)
 
     def unlink(self, cr, uid, ids, context=None, check=True):
-        context = context or {}
         toremove = []
         obj_move_line = self.pool.get('account.move.line')
-        for move in self.browse(cr, uid, ids, context):
+        for move in self.browse(cr, uid, ids, context=context):
             if move['state'] != 'draft':
                 raise osv.except_osv(_('UserError'),
                         _('You can not delete posted movement: "%s"!') % \
@@ -1294,8 +1291,8 @@ class account_move(osv.osv):
         result = super(account_move, self).unlink(cr, uid, toremove, context)
         return result
 
-    def _compute_balance(self, cr, uid, id, context={}):
-        move = self.browse(cr, uid, [id])[0]
+    def _compute_balance(self, cr, uid, id, context=None):
+        move = self.browse(cr, uid, id, context=context)
         amount = 0
         for line in move.line_id:
             amount+= (line.debit - line.credit)
@@ -1358,7 +1355,7 @@ class account_move(osv.osv):
     #
     # Validate a balanced move. If it is a centralised journal, create a move.
     #
-    def validate(self, cr, uid, ids, context={}):
+    def validate(self, cr, uid, ids, context=None):
         if context and ('__last_update' in context):
             del context['__last_update']
 
@@ -1472,9 +1469,9 @@ class account_move_reconcile(osv.osv):
     _defaults = {
         'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/',
     }
-    def reconcile_partial_check(self, cr, uid, ids, type='auto', context={}):
+    def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None):
         total = 0.0
-        for rec in self.browse(cr, uid, ids, context):
+        for rec in self.browse(cr, uid, ids, context=context):
             for line in rec.line_partial_ids:
                 total += (line.debit or 0.0) - (line.credit or 0.0)
         if not total:
@@ -1488,7 +1485,7 @@ class account_move_reconcile(osv.osv):
         if not ids:
             return []
         result = []
-        for r in self.browse(cr, uid, ids, context):
+        for r in self.browse(cr, uid, ids, context=context):
             total = reduce(lambda y,t: (t.debit or 0.0) - (t.credit or 0.0) + y, r.line_partial_ids, 0.0)
             if total:
                 name = '%s (%.2f)' % (r.name, total)
@@ -1537,7 +1534,7 @@ class account_tax_code(osv.osv):
                        (parent_ids,) + where_params)
         res=dict(cr.fetchall())
         obj_precision = self.pool.get('decimal.precision')
-        for record in self.browse(cr, uid, ids, context):
+        for record in self.browse(cr, uid, ids, context=context):
             def _rec_get(record):
                 amount = res.get(record.id, 0.0)
                 for rec in record.child_ids:
@@ -1619,7 +1616,7 @@ class account_tax_code(osv.osv):
         return [(x['id'], (x['code'] and (x['code'] + ' - ') or '') + x['name']) \
                 for x in reads]
 
-    def _default_company(self, cr, uid, context={}):
+    def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if user.company_id:
             return user.company_id.id
@@ -1723,7 +1720,7 @@ class account_tax(osv.osv):
         """
         if not args:
             args = []
-        if not context:
+        if context is None:
             context = {}
         ids = []
         if name:
@@ -2062,7 +2059,7 @@ class account_model(osv.osv):
             raise osv.except_osv(_('No period found !'), _('Unable to find a valid period !'))
         period_id = period_id[0]
 
-        for model in self.browse(cr, uid, ids, context):
+        for model in self.browse(cr, uid, ids, context=context):
             entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%Y-%m')}
             move_id = account_move_obj.create(cr, uid, {
                 'ref': entry['name'],
@@ -2168,13 +2165,13 @@ class account_subscription(osv.osv):
         'period_nbr': 1,
         'state': 'draft',
     }
-    def state_draft(self, cr, uid, ids, context={}):
+    def state_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'draft'})
         return False
 
-    def check(self, cr, uid, ids, context={}):
+    def check(self, cr, uid, ids, context=None):
         todone = []
-        for sub in self.browse(cr, uid, ids, context):
+        for sub in self.browse(cr, uid, ids, context=context):
             ok = True
             for line in sub.lines_id:
                 if not line.move_id.id:
@@ -2186,9 +2183,9 @@ class account_subscription(osv.osv):
             self.write(cr, uid, todone, {'state':'done'})
         return False
 
-    def remove_line(self, cr, uid, ids, context={}):
+    def remove_line(self, cr, uid, ids, context=None):
         toremove = []
-        for sub in self.browse(cr, uid, ids, context):
+        for sub in self.browse(cr, uid, ids, context=context):
             for line in sub.lines_id:
                 if not line.move_id.id:
                     toremove.append(line.id)
@@ -2197,8 +2194,8 @@ class account_subscription(osv.osv):
         self.write(cr, uid, ids, {'state':'draft'})
         return False
 
-    def compute(self, cr, uid, ids, context={}):
-        for sub in self.browse(cr, uid, ids, context):
+    def compute(self, cr, uid, ids, context=None):
+        for sub in self.browse(cr, uid, ids, context=context):
             ds = sub.date_start
             for i in range(sub.period_total):
                 self.pool.get('account.subscription.line').create(cr, uid, {
@@ -2296,10 +2293,10 @@ class account_account_template(osv.osv):
     ]
 
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
-        reads = self.read(cr, uid, ids, ['name','code'], context)
+        reads = self.read(cr, uid, ids, ['name','code'], context=context)
         res = []
         for record in reads:
             name = record['name']
@@ -2316,7 +2313,7 @@ class account_add_tmpl_wizard(osv.osv_memory):
     With the 'nocreate' option, some accounts may not be created. Use this to add them later."""
     _name = 'account.addtmpl.wizard'
 
-    def _get_def_cparent(self, cr, uid, context):
+    def _get_def_cparent(self, cr, uid, context=None):
         acc_obj=self.pool.get('account.account')
         tmpl_obj=self.pool.get('account.account.template')
         tids=tmpl_obj.read(cr, uid, [context['tmpl_ids']], ['parent_id'])
@@ -2338,6 +2335,8 @@ class account_add_tmpl_wizard(osv.osv_memory):
     }
 
     def action_create(self,cr,uid,ids,context=None):
+        if context is None:
+            context = {}
         acc_obj = self.pool.get('account.account')
         tmpl_obj = self.pool.get('account.account.template')
         data = self.read(cr, uid, ids)
@@ -2463,16 +2462,16 @@ class account_tax_template(osv.osv):
         'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
     }
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
         res = []
-        for record in self.read(cr, uid, ids, ['description','name'], context):
+        for record in self.read(cr, uid, ids, ['description','name'], context=context):
             name = record['description'] and record['description'] or record['name']
             res.append((record['id'],name ))
         return res
 
-    def _default_company(self, cr, uid, context={}):
+    def _default_company(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if user.company_id:
             return user.company_id.id
@@ -2579,7 +2578,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False
         return res
 
-    def _get_chart(self, cr, uid, context={}):
+    def _get_chart(self, cr, uid, context=None):
         ids = self.pool.get('account.chart.template').search(cr, uid, [], context=context)
         if ids:
             return ids[0]
@@ -2625,7 +2624,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         #create all the tax code
         children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id')
         children_tax_code_template.sort()
-        for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template):
+        for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template, context=context):
             vals={
                 'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name,
                 'code': tax_code_template.code,
@@ -2682,7 +2681,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)])
         children_acc_template.sort()
-        for account_template in obj_acc_template.browse(cr, uid, children_acc_template):
+        for account_template in obj_acc_template.browse(cr, uid, children_acc_template,context=context):
             tax_ids = []
             for tax in account_template.tax_ids:
                 tax_ids.append(tax_template_ref[tax.id])
@@ -2722,7 +2721,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
         # Creating Journals Sales and Purchase
         vals_journal={}
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_sp_journal_view')])
-        data = obj_data.browse(cr, uid, data_id[0])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id = data.res_id
 
         seq_id = obj_sequence.search(cr, uid, [('name','=','Account Journal')])[0]
@@ -2835,11 +2834,11 @@ class wizard_multi_charts_accounts(osv.osv_memory):
 
         # Bank Journals
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')])
-        data = obj_data.browse(cr, uid, data_id[0])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id_cash = data.res_id
 
         data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view_multi')])
-        data = obj_data.browse(cr, uid, data_id[0])
+        data = obj_data.browse(cr, uid, data_id[0], context=context)
         view_id_cur = data.res_id
         ref_acc_bank = obj_multi.chart_template_id.bank_account_view_id
 
@@ -2932,7 +2931,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             obj_tax_fp = self.pool.get('account.fiscal.position.tax')
             obj_ac_fp = self.pool.get('account.fiscal.position.account')
 
-            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids):
+            for position in obj_fiscal_position_template.browse(cr, uid, fp_ids, context=context):
 
                 vals_fp = {
                     'company_id': company_id,
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index 329eb59ab05..a8d8044a6c2 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -58,8 +58,8 @@ class account_analytic_line(osv.osv):
         return super(account_analytic_line, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
 
-    def _check_company(self, cr, uid, ids):
-        lines = self.browse(cr, uid, ids)
+    def _check_company(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.move_id and not l.account_id.company_id.id == l.move_id.account_id.company_id.id:
                 return False
@@ -80,7 +80,7 @@ class account_analytic_line(osv.osv):
         analytic_journal_obj =self.pool.get('account.analytic.journal')
         product_price_type_obj = self.pool.get('product.price.type')
         j_id = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
-        prod = product_obj.browse(cr, uid, prod_id)
+        prod = product_obj.browse(cr, uid, prod_id, context=context)
         result = 0.0
 
         if j_id.type <> 'sale':
@@ -105,13 +105,13 @@ class account_analytic_line(osv.osv):
         flag = False
         # Compute based on pricetype
         product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','standard_price')], context=context)
-        pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
+        pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
         if journal_id:
-            journal = analytic_journal_obj.browse(cr, uid, journal_id)
+            journal = analytic_journal_obj.browse(cr, uid, journal_id, context=context)
             if journal.type == 'sale':
                 product_price_type_ids = product_price_type_obj.search(cr, uid, [('field','=','list_price')], context)
                 if product_price_type_ids:
-                    pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context)[0]
+                    pricetype = product_price_type_obj.browse(cr, uid, product_price_type_ids, context=context)[0]
         # Take the company currency as the reference one
         if pricetype.field == 'list_price':
             flag = True
@@ -133,7 +133,9 @@ class account_analytic_line(osv.osv):
             }
         }
 
-    def view_header_get(self, cr, user, view_id, view_type, context):
+    def view_header_get(self, cr, user, view_id, view_type, context=None):
+        if context is None:
+            context = {}
         if context.get('account_id', False):
             # account_id in context may also be pointing to an account.account.id
             cr.execute('select name from account_analytic_account where id=%s', (context['account_id'],))
diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index 93d2a6fb00d..ab2f72e92dd 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -46,7 +46,9 @@ class account_bank_statement(osv.osv):
                 account_bank_statement_line_obj.write(cr, uid, [line.id], {'sequence': seq}, context=context)
         return res
 
-    def _default_journal_id(self, cr, uid, context={}):
+    def _default_journal_id(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         journal_pool = self.pool.get('account.journal')
         journal_type = context.get('journal_type', False)
         journal_id = False
@@ -56,11 +58,11 @@ class account_bank_statement(osv.osv):
                 journal_id = ids[0]
         return journal_id
 
-    def _default_balance_start(self, cr, uid, context={}):
+    def _default_balance_start(self, cr, uid, context=None):
         cr.execute('select id from account_bank_statement where journal_id=%s order by date desc limit 1', (1,))
         res = cr.fetchone()
         if res:
-            return self.browse(cr, uid, [res[0]], context)[0].balance_end
+            return self.browse(cr, uid, res[0], context=context).balance_end
         return 0.0
 
     def _end_balance(self, cursor, user, ids, name, attr, context=None):
@@ -95,7 +97,7 @@ class account_bank_statement(osv.osv):
             res[r] = round(res[r], 2)
         return res
 
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
         periods = self.pool.get('account.period').find(cr, uid)
         if periods:
             return periods[0]
@@ -195,11 +197,13 @@ class account_bank_statement(osv.osv):
         return self.write(cr, uid, ids, {}, context=context)
 
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
+        if context is None:
+            context = {}
         res_currency_obj = self.pool.get('res.currency')
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_bank_statement_line_obj = self.pool.get('account.bank.statement.line')
-        st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context)
+        st_line = account_bank_statement_line_obj.browse(cr, uid, st_line_id, context=context)
         st = st_line.statement_id
 
         context.update({'date': st_line.date})
@@ -299,7 +303,7 @@ class account_bank_statement(osv.osv):
         return st_number + '/' + str(st_line.sequence)
 
     def balance_check(self, cr, uid, st_id, journal_type='bank', context=None):
-        st = self.browse(cr, uid, st_id, context)
+        st = self.browse(cr, uid, st_id, context=context)
         if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001):
             raise osv.except_osv(_('Error !'),
                     _('The statement balance is incorrect !\n') +
@@ -318,7 +322,7 @@ class account_bank_statement(osv.osv):
         if context is None:
             context = {}
 
-        for st in self.browse(cr, uid, ids, context):
+        for st in self.browse(cr, uid, ids, context=context):
             j_type = st.journal_id.type
             company_currency_id = st.journal_id.company_id.currency_id.id
             if not self.check_status_condition(cr, uid, st.state, journal_type=j_type):
@@ -360,7 +364,7 @@ class account_bank_statement(osv.osv):
     def button_cancel(self, cr, uid, ids, context=None):
         done = []
         account_move_obj = self.pool.get('account.move')
-        for st in self.browse(cr, uid, ids, context):
+        for st in self.browse(cr, uid, ids, context=context):
             if st.state=='draft':
                 continue
             ids = []
@@ -381,7 +385,7 @@ class account_bank_statement(osv.osv):
         return {'value': {'balance_start': balance_start, 'account_id': account_id}}
 
     def unlink(self, cr, uid, ids, context=None):
-        stat = self.read(cr, uid, ids, ['state'])
+        stat = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for t in stat:
             if t['state'] in ('draft'):
@@ -412,7 +416,7 @@ class account_bank_statement_line(osv.osv):
         if not partner_id:
             return res
         account_id = False
-        line = self.browse(cr, uid, line_id)
+        line = self.browse(cr, uid, line_id, context=context)
         if not line or (line and not line[0].account_id):
             part = obj_partner.browse(cr, uid, partner_id, context=context)
             if type == 'supplier':
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index cf17a799372..86b00ad98b3 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -41,7 +41,7 @@ class account_cashbox_line(osv.osv):
         @return: Dictionary of values.
         """
         res = {}
-        for obj in self.browse(cr, uid, ids):
+        for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = obj.pieces * obj.number
         return res
 
@@ -76,7 +76,7 @@ class account_cash_statement(osv.osv):
         @return: Dictionary of values.
         """
         res = {}
-        for statement in self.browse(cr, uid, ids):
+        for statement in self.browse(cr, uid, ids, context=context):
             amount_total = 0.0
 
             if statement.journal_id.type not in('cash'):
@@ -96,7 +96,7 @@ class account_cash_statement(osv.osv):
         @return: Dictionary of values.
         """
         res = {}
-        for statement in self.browse(cr, uid, ids):
+        for statement in self.browse(cr, uid, ids, context=context):
             amount_total = 0.0
             for line in statement.ending_details_ids:
                 amount_total += line.pieces * line.number
@@ -111,7 +111,7 @@ class account_cash_statement(osv.osv):
         @return: Dictionary of values.
         """
         res2 = {}
-        for statement in self.browse(cr, uid, ids):
+        for statement in self.browse(cr, uid, ids, context=context):
             encoding_total=0.0
             for line in statement.line_ids:
                encoding_total += line.amount
@@ -160,7 +160,7 @@ class account_cash_statement(osv.osv):
             company_id = company_pool.search(cr, uid, [])
         return company_id and company_id[0] or False
 
-    def _get_cash_open_box_lines(self, cr, uid, context={}):
+    def _get_cash_open_box_lines(self, cr, uid, context=None):
         res = []
         curr = [1, 2, 5, 10, 20, 50, 100, 500]
         for rs in curr:
@@ -173,14 +173,14 @@ class account_cash_statement(osv.osv):
         if journal_ids:
             results = self.search(cr, uid, [('journal_id', 'in', journal_ids),('state', '=', 'confirm')], context=context)
             if results:
-                cash_st = self.browse(cr, uid, results, context)[0]
+                cash_st = self.browse(cr, uid, results, context=context)[0]
                 for cash_line in cash_st.ending_details_ids:
                     for r in res:
                         if cash_line.pieces == r['pieces']:
                             r['number'] = cash_line.number
         return res
 
-    def _get_default_cash_close_box_lines(self, cr, uid, context={}):
+    def _get_default_cash_close_box_lines(self, cr, uid, context=None):
         res = []
         curr = [1, 2, 5, 10, 20, 50, 100, 500]
         for rs in curr:
@@ -191,7 +191,7 @@ class account_cash_statement(osv.osv):
             res.append(dct)
         return res
 
-    def _get_cash_close_box_lines(self, cr, uid, context={}):
+    def _get_cash_close_box_lines(self, cr, uid, context=None):
         res = []
         curr = [1, 2, 5, 10, 20, 50, 100, 500]
         for rs in curr:
@@ -202,11 +202,11 @@ class account_cash_statement(osv.osv):
             res.append((0, 0, dct))
         return res
 
-    def _get_cash_open_close_box_lines(self, cr, uid, context={}):
+    def _get_cash_open_close_box_lines(self, cr, uid, context=None):
         res = {}
         start_l = []
         end_l = []
-        starting_details = self._get_cash_open_box_lines(cr, uid, context)
+        starting_details = self._get_cash_open_box_lines(cr, uid, context=context)
         ending_details = self._get_default_cash_close_box_lines(cr, uid, context)
         for start in starting_details:
             start_l.append((0, 0, start))
@@ -248,7 +248,7 @@ class account_cash_statement(osv.osv):
         if open_jrnl:
             raise osv.except_osv(_('Error'), _('You can not have two open register for the same journal'))
 
-        if self.pool.get('account.journal').browse(cr, uid, vals['journal_id']).type == 'cash':
+        if self.pool.get('account.journal').browse(cr, uid, vals['journal_id'], context=context).type == 'cash':
             open_close = self._get_cash_open_close_box_lines(cr, uid, context)
             if vals.get('starting_details_ids', False):
                 for start in vals.get('starting_details_ids'):
@@ -283,7 +283,7 @@ class account_cash_statement(osv.osv):
         @return: True on success, False otherwise
         """
 
-        super(account_cash_statement, self).write(cr, uid, ids, vals)
+        super(account_cash_statement, self).write(cr, uid, ids, vals, context=context)
         res = self._get_starting_balance(cr, uid, ids)
         for rs in res:
             super(account_cash_statement, self).write(cr, uid, [rs], res.get(rs))
@@ -338,7 +338,7 @@ class account_cash_statement(osv.osv):
                 'state': 'open',
 
             })
-            self.write(cr, uid, [statement.id], vals)
+            self.write(cr, uid, [statement.id], vals, context=context)
         return True
 
     def balance_check(self, cr, uid, cash_id, journal_type='bank', context=None):
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 2987b3c69d6..02c5abcb130 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -107,9 +107,9 @@ class account_move_line(osv.osv):
                 del data[f]
         return data
 
-    def create_analytic_lines(self, cr, uid, ids, context={}):
+    def create_analytic_lines(self, cr, uid, ids, context=None):
         acc_ana_line_obj = self.pool.get('account.analytic.line')
-        for obj_line in self.browse(cr, uid, ids, context):
+        for obj_line in self.browse(cr, uid, ids, context=context):
             if obj_line.analytic_account_id:
                 if not obj_line.journal_id.analytic_journal_id:
                     raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
@@ -139,7 +139,9 @@ class account_move_line(osv.osv):
             del(data['account_tax_id'])
         return data
 
-    def convert_to_period(self, cr, uid, context={}):
+    def convert_to_period(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         period_obj = self.pool.get('account.period')
         #check if the period_id changed in the context from client side
         if context.get('period_id', False):
@@ -151,7 +153,9 @@ class account_move_line(osv.osv):
                 })
         return context
 
-    def _default_get(self, cr, uid, fields, context={}):
+    def _default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
         if not context.get('journal_id', False) and context.get('search_default_journal_id', False):
             context['journal_id'] = context.get('search_default_journal_id')
         account_obj = self.pool.get('account.account')
@@ -164,7 +168,7 @@ class account_move_line(osv.osv):
         currency_obj = self.pool.get('res.currency')
         context = self.convert_to_period(cr, uid, context)
         # Compute simple values
-        data = super(account_move_line, self).default_get(cr, uid, fields, context)
+        data = super(account_move_line, self).default_get(cr, uid, fields, context=context)
         # Starts: Manual entry from account.move form
         if context.get('lines',[]):
             total_new = 0.00
@@ -174,7 +178,7 @@ class account_move_line(osv.osv):
                     for item in i[2]:
                             data[item] = i[2][item]
             if context['journal']:
-                journal_data = journal_obj.browse(cr, uid, context['journal'])
+                journal_data = journal_obj.browse(cr, uid, context['journal'], context=context)
                 if journal_data.type == 'purchase':
                     if total_new > 0:
                         account = journal_data.default_credit_account_id
@@ -186,9 +190,9 @@ class account_move_line(osv.osv):
                     else:
                         account = journal_data.default_debit_account_id
                 if account and ((not fields) or ('debit' in fields) or ('credit' in fields)) and 'partner_id' in data and (data['partner_id']):
-                    part = partner_obj.browse(cr, uid, data['partner_id'])
+                    part = partner_obj.browse(cr, uid, data['partner_id'], context=context)
                     account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
-                    account = account_obj.browse(cr, uid, account)
+                    account = account_obj.browse(cr, uid, account, context=context)
                     data['account_id'] =  account.id
 
             s = -total_new
@@ -236,7 +240,7 @@ class account_move_line(osv.osv):
             return data
         total = 0
         ref_id = False
-        move = move_obj.browse(cr, uid, move_id, context)
+        move = move_obj.browse(cr, uid, move_id, context=context)
         if 'name' in fields:
             data.setdefault('name', move.line_id[-1].name)
         acc1 = False
@@ -265,7 +269,7 @@ class account_move_line(osv.osv):
         # part = False is acceptable for fiscal position.
         account = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, account.id)
         if account:
-            account = account_obj.browse(cr, uid, account)
+            account = account_obj.browse(cr, uid, account, context=context)
 
         if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
             data['account_id'] = account.id
@@ -289,10 +293,10 @@ class account_move_line(osv.osv):
             data['amount_currency'] = v
         return data
 
-    def on_create_write(self, cr, uid, id, context={}):
+    def on_create_write(self, cr, uid, id, context=None):
         if not id:
             return []
-        ml = self.browse(cr, uid, id, context)
+        ml = self.browse(cr, uid, id, context=context)
         return map(lambda x: x.id, ml.move_id.line_id)
 
     def _balance(self, cr, uid, ids, name, arg, context=None):
@@ -334,11 +338,11 @@ class account_move_line(osv.osv):
             res[line_id] = (invoice_id, invoice_names[invoice_id])
         return res
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
         result = []
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.ref:
                 result.append((line.id, (line.move_id.name or '')+' ('+line.ref+')'))
             else:
@@ -454,6 +458,8 @@ class account_move_line(osv.osv):
     }
 
     def _get_date(self, cr, uid, context=None):
+        if context is None:
+            context or {}
         period_obj = self.pool.get('account.period')
         dt = time.strftime('%Y-%m-%d')
         if ('journal_id' in context) and ('period_id' in context):
@@ -495,35 +501,35 @@ class account_move_line(osv.osv):
         ('credit_debit2', 'CHECK (credit+debit>=0)', 'Wrong credit or debit value in accounting entry !'),
     ]
 
-    def _auto_init(self, cr, context={}):
-        super(account_move_line, self)._auto_init(cr, context)
+    def _auto_init(self, cr, context=None):
+        super(account_move_line, self)._auto_init(cr, context=context)
         cr.execute('SELECT indexname FROM pg_indexes WHERE indexname = \'account_move_line_journal_id_period_id_index\'')
         if not cr.fetchone():
             cr.execute('CREATE INDEX account_move_line_journal_id_period_id_index ON account_move_line (journal_id, period_id)')
 
-    def _check_no_view(self, cr, uid, ids):
-        lines = self.browse(cr, uid, ids)
+    def _check_no_view(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.account_id.type == 'view':
                 return False
         return True
 
-    def _check_no_closed(self, cr, uid, ids):
-        lines = self.browse(cr, uid, ids)
+    def _check_no_closed(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.account_id.type == 'closed':
                 return False
         return True
 
-    def _check_company_id(self, cr, uid, ids):
-        lines = self.browse(cr, uid, ids)
+    def _check_company_id(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
                 return False
         return True
 
-    def _check_partner_id(self, cr, uid, ids):
-        lines = self.browse(cr, uid, ids)
+    def _check_partner_id(self, cr, uid, ids, context=None):
+        lines = self.browse(cr, uid, ids, context=context)
         for l in lines:
             if l.account_id.type in ('receivable', 'payable') and not l.partner_id:
                 return False
@@ -546,7 +552,7 @@ class account_move_line(osv.osv):
         if (not currency_id) or (not account_id):
             return {}
         result = {}
-        acc = account_obj.browse(cr, uid, account_id)
+        acc = account_obj.browse(cr, uid, account_id, context=context)
         if (amount>0) and journal:
             x = journal_obj.browse(cr, uid, journal).default_credit_account_id
             if x: acc = x
@@ -662,7 +668,7 @@ class account_move_line(osv.osv):
                 raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
             company_list.append(line.company_id.id)
 
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.reconcile_id:
                 raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
             if line.reconcile_partial_id:
@@ -808,8 +814,10 @@ class account_move_line(osv.osv):
                 partner_obj.write(cr, uid, [partner_id], {'last_reconciliation_date': time.strftime('%Y-%m-%d %H:%M:%S')})
         return r_id
 
-    def view_header_get(self, cr, user, view_id, view_type, context):
-        context = self.convert_to_period(cr, user, context)
+    def view_header_get(self, cr, user, view_id, view_type, context=None):
+        if context is None:
+            context = {}
+        context = self.convert_to_period(cr, user, context=context)
         if context.get('account_id', False):
             cr.execute('SELECT code FROM account_account WHERE id = %s', (context['account_id'], ))
             res = cr.fetchone()
@@ -825,7 +833,7 @@ class account_move_line(osv.osv):
             return j+(p and (':'+p) or '')
         return False
 
-    def onchange_date(self, cr, user, ids, date, context={}):
+    def onchange_date(self, cr, user, ids, date, context=None):
         """
         Returns a dict that contains new values and context
         @param cr: A database cursor
@@ -836,6 +844,8 @@ class account_move_line(osv.osv):
         @return: Returns a dict which contains new values, and context
         """
         res = {}
+        if context is None:
+            context = {}
         period_pool = self.pool.get('account.period')
         pids = period_pool.search(cr, user, [('date_start','<=',date), ('date_stop','>=',date)])
         if pids:
@@ -850,9 +860,11 @@ class account_move_line(osv.osv):
             'context':context,
         }
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         journal_pool = self.pool.get('account.journal')
-        result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
+        if context is None:
+            context = {}
+        result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu)
         if view_type != 'tree':
             #Remove the toolbar from the form view
             if view_type == 'form':
@@ -871,7 +883,7 @@ class account_move_line(osv.osv):
         xml = '''<?xml version="1.0"?>\n<tree string="%s" editable="top" refresh="5" on_write="on_create_write" colors="red:state==\'draft\';black:state==\'valid\'">\n\t''' % (title)
 
         ids = journal_pool.search(cr, uid, [])
-        journals = journal_pool.browse(cr, uid, ids)
+        journals = journal_pool.browse(cr, uid, ids, context=context)
         all_journal = [None]
         common_fields = {}
         total = len(journals)
@@ -952,8 +964,10 @@ class account_move_line(osv.osv):
         result['fields'] = self.fields_get(cr, uid, flds, context)
         return result
 
-    def _check_moves(self, cr, uid, context):
+    def _check_moves(self, cr, uid, context=None):
         # use the first move ever created for this journal and period
+        if context is None:
+            context = {}
         cr.execute('SELECT id, state, name FROM account_move WHERE journal_id = %s AND period_id = %s ORDER BY id limit 1', (context['journal_id'],context['period_id']))
         res = cr.fetchone()
         if res:
@@ -981,11 +995,13 @@ class account_move_line(osv.osv):
             obj_move_rec.unlink(cr, uid, unlink_ids)
         return True
 
-    def unlink(self, cr, uid, ids, context={}, check=True):
+    def unlink(self, cr, uid, ids, context=None, check=True):
+        if context is None:
+            context = {}
         move_obj = self.pool.get('account.move')
         self._update_check(cr, uid, ids, context)
         result = False
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             context['journal_id'] = line.journal_id.id
             context['period_id'] = line.period_id.id
             result = super(account_move_line, self).unlink(cr, uid, [line.id], context=context)
@@ -1014,9 +1030,9 @@ class account_move_line(osv.osv):
                 journal_id = context.get('journal_id', False)
                 period_id = context.get('period_id', False)
             if journal_id:
-                journal = journal_obj.browse(cr, uid, [journal_id])[0]
+                journal = journal_obj.browse(cr, uid, journal_id, context=context)
                 if journal.allow_date and period_id:
-                    period = period_obj.browse(cr, uid, [period_id])[0]
+                    period = period_obj.browse(cr, uid, period_id, context=context)
                     if not time.strptime(vals['date'][:10],'%Y-%m-%d') >= time.strptime(period.date_start, '%Y-%m-%d') or not time.strptime(vals['date'][:10], '%Y-%m-%d') <= time.strptime(period.date_stop, '%Y-%m-%d'):
                         raise osv.except_osv(_('Error'),_('The date of your Journal Entry is not in the defined period!'))
         else:
@@ -1069,7 +1085,7 @@ class account_move_line(osv.osv):
                         move_obj.write(cr, uid, [line.move_id.id], {'date': todo_date}, context=context)
         return result
 
-    def _update_journal_check(self, cr, uid, journal_id, period_id, context={}):
+    def _update_journal_check(self, cr, uid, journal_id, period_id, context=None):
         journal_obj = self.pool.get('account.journal')
         period_obj = self.pool.get('account.period')
         jour_period_obj = self.pool.get('account.journal.period')
@@ -1079,8 +1095,8 @@ class account_move_line(osv.osv):
             if state == 'done':
                 raise osv.except_osv(_('Error !'), _('You can not add/modify entries in a closed journal.'))
         if not result:
-            journal = journal_obj.browse(cr, uid, journal_id, context)
-            period = period_obj.browse(cr, uid, period_id, context)
+            journal = journal_obj.browse(cr, uid, journal_id, context=context)
+            period = period_obj.browse(cr, uid, period_id, context=context)
             jour_period_obj.create(cr, uid, {
                 'name': (journal.code or journal.name)+':'+(period.name or ''),
                 'journal_id': journal.id,
@@ -1088,9 +1104,9 @@ class account_move_line(osv.osv):
             })
         return True
 
-    def _update_check(self, cr, uid, ids, context={}):
+    def _update_check(self, cr, uid, ids, context=None):
         done = {}
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.move_id.state <> 'draft' and (not line.journal_id.entry_posted):
                 raise osv.except_osv(_('Error !'), _('You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !'))
             if line.reconcile_id:
@@ -1127,7 +1143,7 @@ class account_move_line(osv.osv):
 
         self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context)
         move_id = vals.get('move_id', False)
-        journal = journal_obj.browse(cr, uid, context['journal_id'])
+        journal = journal_obj.browse(cr, uid, context['journal_id'], context=context)
         if not move_id:
             if journal.centralisation:
                 #Check for centralisation
@@ -1150,7 +1166,7 @@ class account_move_line(osv.osv):
                     raise osv.except_osv(_('No piece number !'), _('Can not create an automatic sequence for this piece !\n\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece.'))
         ok = not (journal.type_control_ids or journal.account_control_ids)
         if ('account_id' in vals):
-            account = account_obj.browse(cr, uid, vals['account_id'])
+            account = account_obj.browse(cr, uid, vals['account_id'], context=context)
             if journal.type_control_ids:
                 type = account.user_type
                 for t in journal.type_control_ids:
diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot
index 13345673c44..e2391e102d2 100644
--- a/addons/account/i18n/account.pot
+++ b/addons/account/i18n/account.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:14:45+0000\n"
-"PO-Revision-Date: 2010-12-10 17:14:45+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -328,6 +328,12 @@ msgstr ""
 msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
 msgstr ""
 
+#. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
+msgid "Configure"
+msgstr ""
+
 #. module: account
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
@@ -1191,11 +1197,6 @@ msgstr ""
 msgid "Overdue Payments"
 msgstr ""
 
-#. module: account
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
@@ -1943,6 +1944,11 @@ msgstr ""
 msgid "Search Chart of Account Templates"
 msgstr ""
 
+#. module: account
+#: view:account.installer:0
+msgid "The default Chart of Accounts is matching your country selection. If no certified Chart of Accounts exists for your specified country, a generic one can be installed and will be selected by default."
+msgstr ""
+
 #. module: account
 #: view:account.account.type:0
 #: field:account.account.type,note:0
@@ -2845,7 +2851,10 @@ msgid "Purchase"
 msgstr ""
 
 #. module: account
+#: view:account.installer:0
+#: view:account.installer.modules:0
 #: model:ir.actions.act_window,name:account.action_account_installer
+#: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
 msgstr ""
 
@@ -3293,17 +3302,9 @@ msgid "#Entries"
 msgstr ""
 
 #. module: account
-#: view:account.account:0
-#: field:account.account,user_type:0
-#: view:account.account.template:0
-#: field:account.account.template,user_type:0
-#: view:account.account.type:0
-#: field:account.bank.accounts.wizard,account_type:0
-#: field:account.entries.report,user_type:0
-#: model:ir.model,name:account.model_account_account_type
-#: field:report.account.receivable,type:0
-#: field:report.account_type.sales,user_type:0
-msgid "Account Type"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
 msgstr ""
 
 #. module: account
@@ -3521,9 +3522,17 @@ msgid "Shortcut"
 msgstr ""
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "The Payment Term of Supplier does not have Payment Term Lines(Computation) defined !"
+#: view:account.account:0
+#: field:account.account,user_type:0
+#: view:account.account.template:0
+#: field:account.account.template,user_type:0
+#: view:account.account.type:0
+#: field:account.bank.accounts.wizard,account_type:0
+#: field:account.entries.report,user_type:0
+#: model:ir.model,name:account.model_account_account_type
+#: field:report.account.receivable,type:0
+#: field:report.account_type.sales,user_type:0
+msgid "Account Type"
 msgstr ""
 
 #. module: account
@@ -3819,9 +3828,8 @@ msgid "Analytic Account Statistics"
 msgstr ""
 
 #. module: account
-#: report:account.vat.declaration:0
-#: field:account.vat.declaration,based_on:0
-msgid "Based On"
+#: view:wizard.multi.charts.accounts:0
+msgid "This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"
 msgstr ""
 
 #. module: account
@@ -3905,6 +3913,16 @@ msgid "Please verify the price of the invoice !\n"
 "The real total does not match the computed total."
 msgstr ""
 
+#. module: account
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/wizard/account_invoice_state.py:0
+#: code:addons/account/wizard/account_report_balance_sheet.py:0
+#: code:addons/account/wizard/account_state_open.py:0
+#: code:addons/account/wizard/account_validate_account_move.py:0
+#, python-format
+msgid "Warning"
+msgstr ""
+
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
@@ -5373,6 +5391,11 @@ msgstr ""
 msgid "Default Credit Account"
 msgstr ""
 
+#. module: account
+#: view:account.installer:0
+msgid "Configure Your Accounting Chart"
+msgstr ""
+
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 30"
@@ -5544,6 +5567,11 @@ msgstr ""
 msgid "Centralisation"
 msgstr ""
 
+#. module: account
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Accounting Chart from a Chart Template"
+msgstr ""
+
 #. module: account
 #: view:account.account:0
 #: view:account.account.template:0
@@ -5694,6 +5722,12 @@ msgstr ""
 msgid "Fax :"
 msgstr ""
 
+#. module: account
+#: report:account.vat.declaration:0
+#: field:account.vat.declaration,based_on:0
+msgid "Based On"
+msgstr ""
+
 #. module: account
 #: help:res.partner,property_account_receivable:0
 msgid "This account will be used instead of the default one as the receivable account for the current partner"
@@ -6188,11 +6222,6 @@ msgstr ""
 msgid "Unknown Partner"
 msgstr ""
 
-#. module: account
-#: view:account.bank.statement:0
-msgid "Opening Balance"
-msgstr ""
-
 #. module: account
 #: help:account.journal,centralisation:0
 msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
@@ -6854,6 +6883,11 @@ msgstr ""
 msgid "Invoice's state is Open"
 msgstr ""
 
+#. module: account
+#: view:account.installer.modules:0
+msgid "Add extra Accounting functionalities to the ones already installed."
+msgstr ""
+
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -7378,11 +7412,6 @@ msgstr ""
 msgid "Print Account Partner Balance"
 msgstr ""
 
-#. module: account
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
-
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
@@ -7546,6 +7575,11 @@ msgstr ""
 msgid "Dear Sir/Madam,"
 msgstr ""
 
+#. module: account
+#: view:account.installer.modules:0
+msgid "Configure Your Accounting Application"
+msgstr ""
+
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
 msgid "Create and manage accounts you will need to record financial entries in. Accounts are financial records of your company that register all financial transactions. Companies present their annual accounts in two main parts: the balance sheet and the income statement (profit and loss account). The annual accounts of a company are required by law to disclose a certain amount of information. They have to be certified by an external auditor yearly."
@@ -8542,13 +8576,8 @@ msgid "End period"
 msgstr ""
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/wizard/account_invoice_state.py:0
-#: code:addons/account/wizard/account_report_balance_sheet.py:0
-#: code:addons/account/wizard/account_state_open.py:0
-#: code:addons/account/wizard/account_validate_account_move.py:0
-#, python-format
-msgid "Warning"
+#: view:account.bank.statement:0
+msgid "Opening Balance"
 msgstr ""
 
 #. module: account
diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po
index 93a33121ab6..7d3a3c07883 100644
--- a/addons/account/i18n/es.po
+++ b/addons/account/i18n/es.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-14 22:57+0000\n"
+"PO-Revision-Date: 2010-12-15 15:38+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index a7c5cf6aa46..ea290a0d315 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-14 22:09+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-15 23:01+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -63,7 +64,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "Des écritures semblent déjà réconciliées !"
+msgstr "Certaines écritures sont déjà rapprochées !"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:0
@@ -242,6 +243,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
+"Si le champ actif est \"Faux\", il permet de cacher les conditions de "
+"règlement sans les supprimer."
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -384,8 +387,8 @@ msgstr "Ext."
 #, python-format
 msgid "Invoice line account company does not match with invoice company."
 msgstr ""
-"La compagnie de la ligne de facture ne corresponds pas à la compagnie de la "
-"facture"
+"La société de la ligne de facture ne correspond pas à la société de la "
+"facture."
 
 #. module: account
 #: field:account.journal.column,field:0
@@ -522,7 +525,7 @@ msgstr "Positif"
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open For Unreconciliation"
-msgstr "Ouvir pour annuler le lettrage."
+msgstr "Ouvrir pour annuler le lettrage"
 
 #. module: account
 #: field:account.fiscal.position.template,chart_template_id:0
@@ -637,7 +640,7 @@ msgstr "Compte utilisé dans ce journal"
 #: help:account.report.general.ledger,chart_account_id:0
 #: help:account.vat.declaration,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Selectionner le plan de compte"
+msgstr "Sélectionner le plan de compte"
 
 #. module: account
 #: view:product.product:0
@@ -657,7 +660,7 @@ msgstr "Lit."
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "Transaction non-lettrée"
+msgstr "Écritures non rapprochées"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:0
@@ -707,7 +710,7 @@ msgstr "Nom de l'adresse de facturation"
 #. module: account
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr "Trimestriel"
+msgstr "Trimestrielle"
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -742,6 +745,7 @@ msgstr "Journal centralisé"
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
 msgstr ""
+"La séquence principale doit être différente de la séquence courante !"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -769,7 +773,7 @@ msgstr "Clôturer la période"
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Rapport du compte \"Partenaires ordinaires\""
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -793,7 +797,7 @@ msgstr ""
 #: constraint:account.account:0
 #: constraint:account.tax.code:0
 msgid "Error ! You can not create recursive accounts."
-msgstr "Erreur ! Vous ne pouvez pas créer des compte récursifs"
+msgstr "Erreur ! Vous ne pouvez pas créer de comptes récursifs."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -813,7 +817,7 @@ msgstr "Etes vous sûr de vouloir saisir des écritures ?"
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Chèque"
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
@@ -824,7 +828,7 @@ msgstr "Partenaires rapprochés aujourd'hui"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "The statement balance is incorrect !\n"
-msgstr "Le relevé n'est pas équilibré !\n"
+msgstr "Le solde du relevé est incorrect.\n"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -867,7 +871,7 @@ msgstr "Type"
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
 msgid "Account Subscription Line"
-msgstr "Détail d'une écritures périodique"
+msgstr "Détail d'une écriture périodique"
 
 #. module: account
 #: help:account.invoice,reference:0
@@ -900,7 +904,7 @@ msgstr "Calcul de date d'échéance"
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr "J.C. / nom du Mouvement"
+msgstr "J.C. / Nom du mouvement"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -931,6 +935,9 @@ msgid ""
 "Can not %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only Refund this invoice"
 msgstr ""
+"Ne peut %s la facture, qui est déjà rapprochée, le rapprochement de la "
+"facture devrait être annulé d'abord. Vous ne pouvez que rembourser cette "
+"facture"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -971,7 +978,7 @@ msgstr "Plan de taxes"
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr "Créer des périodes par trimestre"
+msgstr "Créer des périodes trimestrielles"
 
 #. module: account
 #: report:account.overdue:0
@@ -1028,7 +1035,7 @@ msgstr "Filtres étendus..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Journal centralisateur"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1197,7 +1204,7 @@ msgstr "Banque"
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr "Début de la Période"
+msgstr "Début de période"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
@@ -1343,7 +1350,7 @@ msgstr "Sélectionnez un début et une fin de période"
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "Modèles pour les comptes"
+msgstr "Modèles de comptes"
 
 #. module: account
 #: view:account.tax.code.template:0
@@ -1361,7 +1368,7 @@ msgstr "Écritures lettrées"
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr "Retard de règlement"
+msgstr "Règlements en retard"
 
 #. module: account
 #: constraint:account.invoice:0
@@ -1438,7 +1445,7 @@ msgstr "Vous ne pouvez pas utiliser ce compte général dans ce journal !"
 #: selection:account.pl.report,display_account:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "Avec la balance qui n'est pas égal à 0"
+msgstr "Avec la balance qui n'est pas égale à 0"
 
 #. module: account
 #: view:account.tax:0
@@ -1463,7 +1470,7 @@ msgstr "Nb. d'éléments"
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr "Montant maximum de la tolérance dans les écarts de lettrage"
+msgstr "Montant maximum des écarts de lettrage"
 
 #. module: account
 #: view:account.invoice:0
@@ -1532,6 +1539,9 @@ msgid ""
 "customers. OpenERP generates draft of invoices automatically so that you "
 "only have to confirm them before sending them to your customers."
 msgstr ""
+"La facturation client permet de générer et de gérer les factures envoyées à "
+"vos clients. OpenERP génère automatiquement des factures brouillon qu'il "
+"suffit de valider et d'expédier aux clients."
 
 #. module: account
 #: field:account.installer.modules,account_anglo_saxon:0
@@ -1605,6 +1615,8 @@ msgstr "Recherche d'un relevé bancaire"
 msgid ""
 "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
 msgstr ""
+"Crédit ou débit erroné dans le modèle (crédit + débit doit être supérieur à "
+"\"0\") !"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1754,6 +1766,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Si le champ actif est \"Faux\", il permet de cacher la période comptable "
+"sans la supprimer."
 
 #. module: account
 #: view:res.partner:0
@@ -1774,7 +1788,7 @@ msgstr "Créditeurs & Débiteurs"
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "You have to provide an account for the write off entry !"
-msgstr "Vous devez sélectionnez un compte !"
+msgstr "Vous devez sélectionner un compte !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -1815,7 +1829,7 @@ msgstr "L'utilisateur %s n'a pas le droit d'accéder au journal %s !"
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr "Ces périodes ne peuvent se chevaucher."
+msgstr "Ces périodes peuvent se chevaucher."
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
@@ -1843,7 +1857,7 @@ msgstr "Montant du crédit"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on closed account."
-msgstr ""
+msgstr "Impossible de créer une ligne d'écriture sur un compte clôturé"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -1890,7 +1904,7 @@ msgstr "Écritures par ligne"
 #. module: account
 #: report:account.tax.code.entries:0
 msgid "A/c Code"
-msgstr ""
+msgstr "A/c Code"
 
 #. module: account
 #: field:account.invoice,move_id:0
@@ -1927,7 +1941,7 @@ msgstr "Compte analytique"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr "Contrôler le compte défini dans le journal"
+msgstr "Merci de vérifier le compte défini dans le journal"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -2042,6 +2056,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
 msgstr ""
+"Si le champ actif est \"Faux\", il permet de cacher la taxe sans la "
+"supprimer."
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -2056,7 +2072,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr "Annuler lettrage d'un compte"
+msgstr "Annuler le rapprochement des écritures"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
@@ -2080,6 +2096,9 @@ msgid ""
 "A vendor refund is a credit note from your supplier indicating that he "
 "refunds part or totality of the invoice sent to you."
 msgstr ""
+"Un remboursement fournisseur est un avoir émis par votre fournisseur "
+"indiquant qu'il rembourse une partie ou la totalité de la facture qu'il vous "
+"a adressée."
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
@@ -2169,6 +2188,11 @@ msgid ""
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Ce type est utilisé pour différencier les types avec des effets spéciaux "
+"dans OpenERP : \"vue\" ne peut pas avoir d'écritures, \"consolidation\" sont "
+"des comptes qui peuvent avoir des comptes enfants pour les consolidations "
+"multi-sociétés, \"à payer/à recevoir\" sont des comptes de partenaires (pour "
+"les calculs de débit / crédit), \"fermé\" pour les comptes dépréciés."
 
 #. module: account
 #: view:account.chart.template:0
@@ -2385,6 +2409,13 @@ msgid ""
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Ce menu permet d'imprimer une déclaration de TVA fondée sur des factures ou "
+"des paiements. Sélectionnez une ou plusieurs périodes de l'exercice fiscal. "
+"Les informations requises par une déclaration fiscale sont générées "
+"automatiquement par OpenERP à partir des factures (ou des paiements, dans "
+"certains pays). Ces données sont actualisées en temps réel. C'est très utile "
+"car cela permet de prévoir à tout moment les taxes dues en début et en fin "
+"de mois ou du trimestre."
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -2471,12 +2502,12 @@ msgstr ""
 #: view:account.print.journal:0
 msgid ""
 "This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "Ce rapport donne un aperçu de la situation d'un journal particulier"
 
 #. module: account
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de catégorie récursive."
 
 #. module: account
 #: model:account.account.type,name:account.account_type_tax
@@ -2539,7 +2570,7 @@ msgstr ""
 #. module: account
 #: report:account.journal.period.print:0
 msgid "Label"
-msgstr ""
+msgstr "Libellé"
 
 #. module: account
 #: view:account.tax:0
@@ -2649,6 +2680,8 @@ msgid ""
 "given a period and a journal, the sum of debit will always be equal to the "
 "sum of credit, so there is no point to display it"
 msgstr ""
+"pour une période et un journal, la somme des débits sera toujours égale à la "
+"somme des crédits, il n'y a donc aucun intérêt à l'afficher"
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -2664,6 +2697,11 @@ msgid ""
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Cochez cette case si vous voulez que les nouvelles écritures saisies dans le "
+"journal ne passent pas par l'état \"Brouillon\" et soient enregistrées "
+"directement comme validées. \n"
+"Notez que les écritures générées automatiquement par le système sont "
+"validées automatiquement sans passer par l'état \"Brouillon\"."
 
 #. module: account
 #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
@@ -2732,8 +2770,7 @@ msgstr "Août"
 #, python-format
 msgid ""
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
-msgstr ""
-"La balance affiché (%.2f) semble différente que celle calculée. (%.2f)"
+msgstr "Le solde affiché (%.2f) est différent du solde calculé. (%.2f)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2797,6 +2834,8 @@ msgstr ""
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"utilisé pour établir la réconciliation, mais ne devrait pas être utilisé "
+"ailleurs"
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -2820,6 +2859,9 @@ msgid ""
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"La date d'échéance des écritures générées pour ce modèle. Vous pouvez "
+"choisir entre la date de création et la date des écritures ainsi que le "
+"terme de paiement des partenaires."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -2853,6 +2895,8 @@ msgid ""
 "It adds initial balance row on report which display previous sum amount of "
 "debit/credit/balance"
 msgstr ""
+"Cela ajoute la ligne du solde initial sur le rapport qui affiche les "
+"montants précédents de débit / crédit / solde"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3040,6 +3084,8 @@ msgid ""
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
+"Cet assistant validera toutes les écritures pour un journal particulier et "
+"une période. Une fois validées, les écritures ne peuvent plus être modifiées."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3070,6 +3116,15 @@ msgid ""
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Définir ici la méthode qui sera utilisée pour générer la fin des écritures "
+"annuelles pour tous les comptes de ce type.\n"
+"\n"
+"\"Rien\" signifie que rien ne sera fait.\n"
+"\"Balance\" est généralement utilisé pour les comptes de trésorerie.\n"
+"\"Détaillé\" recopie chaque article de journal de l'année précédente, même "
+"ceux qui ont été réconciliés.\n"
+"\"Non réconcilié\" recopie uniquement les éléments non réconciliés sur le "
+"premier jour du nouvel exercice."
 
 #. module: account
 #: view:account.tax:0
@@ -3175,6 +3230,8 @@ msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
 msgstr ""
+"Le montant exprimé dans la devise propre au compte si celle-ci est "
+"différente de celle de la société."
 
 #. module: account
 #: report:account.move.voucher:0
@@ -3303,6 +3360,8 @@ msgid ""
 "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state!"
 msgstr ""
+"Les factures sélectionnées ne peuvent pas être annulées, ayant déjà le "
+"statut \"Annulée\" ou \"Terminée\"."
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -3457,7 +3516,7 @@ msgstr "Date"
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr "Annuler lettrage d'un compte"
+msgstr "Annuler le rapprochement"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:0
@@ -3571,7 +3630,7 @@ msgstr "Chercher des lignes analytiques"
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "Compte de fournisseur"
+msgstr "Compte fournisseur"
 
 #. module: account
 #: constraint:account.move:0
@@ -3591,8 +3650,8 @@ msgstr "Ordre de Paiement"
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
-"Cochez cette case si vous voulez que l'utilisateur réconcilie les entrées "
-"dans ce compte."
+"Cocher cette option si vous souhaitez que l'utilisateur rapproche les "
+"écritures dans ce compte."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance_landscape
@@ -3770,6 +3829,8 @@ msgstr "Valider"
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
 msgstr ""
+"Débit ou crédit erroné dans le modèle (le crédit ou le débit doit être à "
+"\"0\") !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3855,6 +3916,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
 msgstr ""
+"Si le champ actif est à \"Faux\", cela vous permet de cacher le compte sans "
+"le supprimer."
 
 #. module: account
 #: view:account.tax.template:0
@@ -3879,8 +3942,8 @@ msgid ""
 "The Payment Term of Supplier does not have Payment Term Lines(Computation) "
 "defined !"
 msgstr ""
-"Les Conditions de Règlements du Fournisseur n'ont pas de Lignes de "
-"Conditions de Règlements (Calcul) définies !"
+"Les conditions de règlements du fournisseur n'ont pas de lignes de "
+"conditions de règlements (calcul) définies !"
 
 #. module: account
 #: report:account.account.balance:0
@@ -3889,7 +3952,7 @@ msgstr ""
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Balance prévisionelle"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_cancel
@@ -3920,7 +3983,7 @@ msgstr "Fermer la caisse"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Délai moyen de règlement"
 
 #. module: account
 #: view:account.entries.report:0
@@ -3954,7 +4017,7 @@ msgstr "Note"
 #. module: account
 #: view:account.analytic.account:0
 msgid "Overdue Account"
-msgstr ""
+msgstr "Compte en retard"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -3981,6 +4044,12 @@ msgid ""
 "the system on document validation (invoices, bank statements...) and will be "
 "created in 'Posted' state."
 msgstr ""
+"Toutes les nouvelles écritures manuelles sont généralement à l'état «non "
+"comptabilisé», mais on peut définir l'option de sauter cet état sur le "
+"journal associé. Dans ce cas, elles seront traitées comme des écritures "
+"créées automatiquement par le système lors de la validation des documents "
+"(factures, relevés bancaires ...) et elles seront créées à l'état "
+"«comptabilisé»."
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:0
@@ -4065,6 +4134,9 @@ msgid ""
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Quand une nouvelle ligne de transfert est créée, le statut est à "
+"\"Brouillon\".\n"
+"* Lorsque tous les paiements sont effectués, il passera à l'état \"Valide\"."
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4188,6 +4260,11 @@ msgid ""
 "you can create them in the system in order to automate their entries in the "
 "system."
 msgstr ""
+"Une entrée récurrente est un paiement connexe qui se produit sur une "
+"certaine périodicité à partir de la date anniversaire d'un contrat ou d'un "
+"accord avec un client ou un fournisseur. \"Définir des écritures "
+"périodiques\" permet d'automatiser la création de ces écritures dans le "
+"système."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -4503,7 +4580,7 @@ msgstr "Lignes d'écriture"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Assets Accounts)"
-msgstr ""
+msgstr "Bilan (comptes d'actif)"
 
 #. module: account
 #: report:account.tax.code.entries:0
@@ -4549,6 +4626,9 @@ msgid ""
 "To print an analytics (or costs) journal for a given period. The report give "
 "code, move name, account number, general amount and analytic amount."
 msgstr ""
+"Pour imprimer un journal analytique (ou de coûts) pour une période donnée. "
+"Le rapport donne le code, le nom du mouvement, le numéro de compte, le "
+"montant global et le montant analytique."
 
 #. module: account
 #: help:account.journal,refund_journal:0
@@ -4592,7 +4672,7 @@ msgstr "À fermer"
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date not in the Period"
-msgstr ""
+msgstr "Date de vérification hors période"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4614,7 +4694,7 @@ msgstr "Modèles"
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr "Comptes de Taxes Fils"
+msgstr "Comptes de taxe enfant"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -4702,6 +4782,14 @@ msgid ""
 "calendar year gives many companies an advantage, allowing them to close "
 "their books at a time which is most convenient for them."
 msgstr ""
+"Définissez l'exercice comptable de votre société selon la période que vous "
+"avez choisie. Un exercice comptable est une période d'1 an pendant laquelle "
+"une société programme ses dépenses. Un exercice financier est référencé par "
+"sa date de fin. Par exemple, si l'exercice d'une entreprise se termine le 30 "
+"Novembre 2011, la période du 1er Décembre 2010 au 30 Novembre 2011 sera "
+"nommée \"exercice 2011\". Ne pas coïncider avec l'année civile est "
+"avantageux pour beaucoup d'entreprises, cela leur permet de fermer leurs "
+"livres au moment qui leur convient le mieux."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -4718,7 +4806,7 @@ msgstr "Nom de colonne"
 #: view:account.general.journal:0
 msgid ""
 "This report gives you an overview of the situation of your general journals"
-msgstr ""
+msgstr "Ce rapport donne un aperçu de la situation des journaux généraux"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -5132,6 +5220,8 @@ msgid ""
 "According value related accounts will be display on respective reports "
 "(Balance Sheet Profit & Loss Account)"
 msgstr ""
+"Selon les comptes, leur valeur respective sera affichée sur les rapports "
+"correspondants (Bilan, Compte de Résultat)"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
@@ -5201,6 +5291,8 @@ msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
+"Le nombre de montants partiels combinables pour trouver un point d'équilibre "
+"peut être choisi commme générateur du rapprochement automatique"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5232,6 +5324,11 @@ msgid ""
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Si aucune des écritures supplémentaires ne devait être consignée sur un "
+"exercice, on pourrait le fermer à partir d'ici. Cela fermera toutes les "
+"périodes ouvertes de l'année et cela rendra impossible toute nouvelle "
+"écriture. Fermez un exercice lorsque vous avez besoin de finaliser le "
+"résultat définitif. "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5267,7 +5364,7 @@ msgstr "Valide jusqu'à"
 #. module: account
 #: view:board.board:0
 msgid "Aged Receivables"
-msgstr ""
+msgstr "Créances"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -5308,6 +5405,8 @@ msgid ""
 "This module will support the Anglo-Saxons accounting methodology by changing "
 "the accounting logic with stock transactions."
 msgstr ""
+"Ce module est adapté à la méthode comptable anglo-saxone en adaptant la "
+"logique comptable aux transactions de stock."
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5352,7 +5451,7 @@ msgstr "Fournisseur"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Bilanzkonten - Aktiva - Vermögenskonten"
-msgstr ""
+msgstr "Bilanzkonten - Aktiva - Vermögenskonten"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -5428,6 +5527,9 @@ msgid ""
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"À partir de cette vue, on obtient une analyse des différents comptes "
+"financiers. Le document montre vos débits et vos crédits en tenant compte de "
+"certains critères que vous pouvez choisir à l'aide de l'outil de recherche."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5435,6 +5537,10 @@ msgid ""
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Vous montre les progrès réalisés aujourd'hui sur le processus de "
+"réconciliation. Compte tenu par\n"
+"Partenaires rapprochées Aujourd'hui \\ (autres partenaires + Partners "
+"rapprochées Aujourd'hui)"
 
 #. module: account
 #: help:account.payment.term.line,value:0
@@ -5443,6 +5549,9 @@ msgid ""
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Sélectionnez ici le type d'évaluation relatif à cette ligne de conditions de "
+"paiement. Notez que vous devez avoir une dernière ligne de type \"Balance\" "
+"pour assurer que le montant total sera traité."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5705,12 +5814,12 @@ msgstr "Créer un compte à partir de ce modèle"
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr "Parapétrage des rapports"
+msgstr "Paramétrage des rapports"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La société doit être la même pour les comptes et périodes liées."
 
 #. module: account
 #: field:account.tax,type:0
@@ -5912,7 +6021,7 @@ msgstr "Voir les lignes de compte analytique"
 #. module: account
 #: selection:account.account.type,report_type:0
 msgid "Balance Sheet (Liability Accounts)"
-msgstr ""
+msgstr "Bilan (comptes de passif)"
 
 #. module: account
 #: field:account.invoice,internal_number:0
@@ -5981,6 +6090,10 @@ msgid ""
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
+"L'assistant génère le jour des écritures de fin d'exercice de l'année "
+"fiscale sélectionnée. Cet assistant peut être utilisé plusieurs fois pour le "
+"même exercice : il va simplement remplacer les écritures précédentes par les "
+"nouvelles."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -6026,7 +6139,7 @@ msgstr "Saisissez une date de début !"
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Supplier Refund"
-msgstr "Note de Crédit Fournisseur"
+msgstr "Remboursement fournisseur"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
@@ -6206,7 +6319,7 @@ msgid ""
 "This account will be used instead of the default one as the receivable "
 "account for the current partner"
 msgstr ""
-"Ce compte sera utilisé à la place de celui par défaut comme compte recevable "
+"Ce compte sera utilisé à la place de celui par défaut comme compte client "
 "pour le partenaire courant."
 
 #. module: account
@@ -6370,6 +6483,8 @@ msgstr "Toutes les écritures"
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erreur : l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"appartenir à la même catégorie."
 
 #. module: account
 #: view:account.journal.select:0
@@ -6602,6 +6717,8 @@ msgid ""
 "This date will be used as the invoice date for Refund Invoice and Period "
 "will be chosen accordingly!"
 msgstr ""
+"Cette date sera utilisée comme date de la facture de remboursement (de même "
+"pour la période comptable)."
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
@@ -6672,7 +6789,7 @@ msgstr "Modèle de compte parent"
 #. module: account
 #: model:account.account.type,name:account.account_type_income
 msgid "Erfolgskonten - Erlöse"
-msgstr ""
+msgstr "Compte de résultat - Chiffre d'affaires"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6847,7 +6964,7 @@ msgstr "Fermeture de caisse"
 #. module: account
 #: view:account.journal:0
 msgid "Account Journal"
-msgstr "Journal de saisie"
+msgstr "Journal des comptes"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7086,7 +7203,7 @@ msgstr "Mai"
 #: selection:account.partner.balance,result_selection:0
 #: selection:account.partner.ledger,result_selection:0
 msgid "Payable Accounts"
-msgstr "Comptes payables"
+msgstr "Comptes fournisseurs"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7160,7 +7277,7 @@ msgid ""
 "tax."
 msgstr ""
 "Cochez cette case si le prix que vous utilisez pour le produit et les "
-"factures inclus cette taxe."
+"factures inclut cette taxe."
 
 #. module: account
 #: view:account.state.open:0
@@ -7284,7 +7401,7 @@ msgstr "Rapprochement de ligne d'écriture"
 #: view:account.subscription.generate:0
 #: model:ir.model,name:account.model_account_subscription_generate
 msgid "Subscription Compute"
-msgstr "Calcul de la souscription"
+msgstr "Calcul de l'abonnement"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -7535,6 +7652,8 @@ msgid ""
 "Modify Invoice: Cancels the current invoice and creates a new copy of it "
 "ready for editing."
 msgstr ""
+"Modifier la facture : annule la facture en cours et créée une nouvelle copie "
+"de cette facture pour modification."
 
 #. module: account
 #: model:ir.module.module,shortdesc:account.module_meta_information
@@ -7575,7 +7694,7 @@ msgstr "Total net :"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Autres rapports financiers"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -7692,12 +7811,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr ""
+msgstr "Vues journal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Rapprochement d'écritures bancaires"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -7759,14 +7878,14 @@ msgstr "Journal d'avoirs"
 #: report:account.general.journal:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr ""
+msgstr "Filtré par"
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "Analyse société"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -7810,12 +7929,12 @@ msgstr "Réf. partenaire"
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Imprimer le relevé de taxe"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Modèle de ligne d'écriture"
 
 #. module: account
 #: view:account.invoice:0
@@ -7891,7 +8010,7 @@ msgstr "Montant Débit"
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "Trésorerie"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7914,7 +8033,7 @@ msgstr "Comptes autorisés"
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Plan de comptes analytiques"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -7930,7 +8049,7 @@ msgstr "Montant total à payer au fournisseur."
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Coûts analytiques"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -7945,6 +8064,8 @@ msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Cocher cette case pour signaler que cette ligne de journal est en litige "
+"avec le partenaire correspondant"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -7964,13 +8085,13 @@ msgstr "Compte Incorrect !"
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Conserver vide pour tous les exercices comptables ouverts"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "L'écriture (%s) de centralisation a été confirmé !"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8135,7 +8256,7 @@ msgstr ""
 #. module: account
 #: view:account.invoice:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Montant résiduel"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8167,7 +8288,7 @@ msgstr "Période du"
 #: code:addons/account/installer.py:0
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Journal de remboursement de ventes"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -8216,7 +8337,7 @@ msgstr "Créer facture"
 #. module: account
 #: field:account.installer,purchase_tax:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Taxe à l'achat (%)"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -8361,23 +8482,24 @@ msgstr ""
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr "Document: Déclaration du Compte Client"
+msgstr "Document : Relevé de compte client"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
 msgstr ""
+"Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
 #, python-format
 msgid "Current currency is not confirured properly !"
-msgstr ""
+msgstr "La devise du compte n'est pas paramétrée correctement."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Comptes débiteurs"
 
 #. module: account
 #: report:account.move.voucher:0
@@ -8553,7 +8675,7 @@ msgstr ""
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "N° compte"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -8637,7 +8759,7 @@ msgstr ""
 #: report:account.third_party_ledger_other:0
 #: report:account.vat.declaration:0
 msgid "End Period"
-msgstr ""
+msgstr "Fin de période"
 
 #. module: account
 #: field:account.aged.trial.balance,chart_account_id:0
@@ -8656,12 +8778,12 @@ msgstr ""
 #: field:account.report.general.ledger,chart_account_id:0
 #: field:account.vat.declaration,chart_account_id:0
 msgid "Chart of account"
-msgstr ""
+msgstr "Plan comptable"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Date d'échéance"
 
 #. module: account
 #: view:account.move.journal:0
@@ -8938,7 +9060,7 @@ msgstr ""
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For Value percent enter % ratio between 0-1."
-msgstr ""
+msgstr "Saisir le pourcentage entre 0-1"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9394,7 +9516,7 @@ msgstr "L'Écriture est déjà lettrée"
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr "Comptes recevables"
+msgstr "Comptes fournisseurs"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9442,7 +9564,7 @@ msgstr "Modèle de code de taxe comptable"
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
 msgid "Erfolgskonten - Aufwendungen"
-msgstr ""
+msgstr "Comptes de résultats - Dépenses"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9515,7 +9637,7 @@ msgstr "Plan de comptes analytique"
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr "Montant Restant Dû"
+msgstr "Montant restant dû"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
@@ -9538,7 +9660,7 @@ msgstr "Affectation des comptes"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr ""
+msgstr "La facture '%s' est en attente de validation."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9589,7 +9711,7 @@ msgstr "Rechercher une facture"
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund"
-msgstr "Note de crédit"
+msgstr "Rembourser"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
@@ -9629,17 +9751,17 @@ msgstr "Grand Livre (quantités uniquement)"
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Le statut de la facture est \"fermé\""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Dés que le rapprochement est réalisé, la facture peut être payée."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Recherche un modèle de compte"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -9691,6 +9813,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Si le champ actif est à \"Faux\", cela vous permet de cacher le journal "
+"analytique sans le supprimer."
 
 #. module: account
 #: field:account.analytic.line,ref:0
@@ -9740,7 +9864,7 @@ msgstr "Future"
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Rechercher des écritures"
 
 #. module: account
 #: help:account.tax,base_sign:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 224e07f5e79..3573fef6d13 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-15 00:19+0000\n"
+"PO-Revision-Date: 2010-12-15 20:51+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index b65a6ccfd19..c86e6a44df4 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-14 21:02+0000\n"
-"Last-Translator: Christophe (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 21:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 2b9b0f6e06d..e7d35975b46 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-14 23:38+0000\n"
+"PO-Revision-Date: 2010-12-15 17:02+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4745,7 +4745,7 @@ msgstr "Имя счета/контрагента"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transaction"
-msgstr ""
+msgstr "Операция"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -4762,7 +4762,7 @@ msgstr "Использовать данный код для декларации
 #. module: account
 #: view:account.move.line:0
 msgid "Debit/Credit"
-msgstr ""
+msgstr "Дебет/Кредит"
 
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
@@ -4778,7 +4778,7 @@ msgstr "Шаблоны кодов налога"
 #. module: account
 #: model:ir.model,name:account.model_account_installer
 msgid "account.installer"
-msgstr ""
+msgstr "account.installer"
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -4803,6 +4803,8 @@ msgstr "Журнал банковских операций "
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
+"Ошибка: Единицы продажи и единицы измерения должны принадлежать к разным "
+"категориям."
 
 #. module: account
 #: view:account.journal:0
@@ -4842,7 +4844,7 @@ msgstr ""
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "Communication"
-msgstr ""
+msgstr "Общение"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -4881,7 +4883,7 @@ msgstr "Символ кода налога"
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Отчет по счетам созданным за последние 15 дней"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
@@ -4912,7 +4914,7 @@ msgstr "Позиции подписки"
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Количество ТМЦ"
 
 #. module: account
 #: view:account.entries.report:0
@@ -4928,18 +4930,18 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr ""
+msgstr "Изменить валюту"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr ""
+msgstr "Проводки."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Дата платежа"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -5103,7 +5105,7 @@ msgstr ""
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Запись в журнале"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_journal
@@ -5137,14 +5139,14 @@ msgstr ""
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: account
 #: view:account.analytic.journal:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr ""
+msgstr "Журналы аналитики"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -5191,7 +5193,7 @@ msgstr ""
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by type"
-msgstr ""
+msgstr "Счета по типу"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -5208,7 +5210,7 @@ msgstr ""
 #. module: account
 #: field:account.payment.term.line,value:0
 msgid "Valuation"
-msgstr ""
+msgstr "Оценка"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -5279,7 +5281,7 @@ msgstr "Установить период"
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Кол-во позиций"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:0
@@ -5304,13 +5306,13 @@ msgstr ""
 #: field:account.report.general.ledger,filter:0
 #: field:account.vat.declaration,filter:0
 msgid "Filter by"
-msgstr ""
+msgstr "Фильтровать по"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "You can not use an inactive account!"
-msgstr ""
+msgstr "Нельзя использовать неактивный счет !"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -5345,12 +5347,12 @@ msgstr "7"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Неверное действие !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Шаблон налога системы налогообложения"
 
 #. module: account
 #: help:account.tax,name:0
@@ -5373,7 +5375,7 @@ msgstr "Ничего"
 #. module: account
 #: view:analytic.entries.report:0
 msgid "  365 Days  "
-msgstr ""
+msgstr "  365 Дней  "
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -5384,7 +5386,7 @@ msgstr "Возврат средств клиенту"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Расчет суммы"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -5400,12 +5402,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_common.py:0
 #, python-format
 msgid "not implemented"
-msgstr ""
+msgstr "не реализовано"
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Компания связанная с этим журналом"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:0
@@ -5418,14 +5420,14 @@ msgstr ""
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr ""
+msgstr "Замечание о системе налогообложения:"
 
 #. module: account
 #: view:analytic.entries.report:0
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Анализ проводок аналитики"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -5461,7 +5463,7 @@ msgstr "Сообщение о просроченном платеже"
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "Дата создания"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -5491,7 +5493,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "is validated."
-msgstr ""
+msgstr "проверено."
 
 #. module: account
 #: view:account.chart.template:0
@@ -5517,13 +5519,13 @@ msgstr "Налоги с покупателя"
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account based on this template"
-msgstr ""
+msgstr "Создать счет на основе этого шаблона"
 
 #. module: account
 #: view:account.account.type:0
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Настройка отчетов"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -5550,7 +5552,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -5563,7 +5565,7 @@ msgstr ""
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Выберите финансовый год для закрытия"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -5578,7 +5580,7 @@ msgstr ""
 #. module: account
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Information addendum"
-msgstr ""
+msgstr "Дополнительная информация"
 
 #. module: account
 #: field:account.aged.trial.balance,fiscalyear_id:0
@@ -5649,7 +5651,7 @@ msgstr "Отмена"
 #. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
-msgstr ""
+msgstr "Название типа счета"
 
 #. module: account
 #: selection:account.account,type:0
@@ -5672,7 +5674,7 @@ msgstr "Счет по кредиту по умолчанию"
 #. module: account
 #: view:account.payment.term.line:0
 msgid "  number of days: 30"
-msgstr ""
+msgstr "  количество дней: 30"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
@@ -5682,7 +5684,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current"
-msgstr ""
+msgstr "Текущий"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5697,12 +5699,12 @@ msgstr "Собственные средства"
 #. module: account
 #: selection:account.tax,type:0
 msgid "Percentage"
-msgstr ""
+msgstr "Процент"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Журнал и партнер"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -5777,13 +5779,13 @@ msgstr ""
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "Ликвидность"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Аналитические записи журнала"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -5810,7 +5812,7 @@ msgstr ""
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Название журнала должно быть уникальным по компании !"
 
 #. module: account
 #: field:account.account.template,nocreate:0
@@ -5822,12 +5824,13 @@ msgstr ""
 #, python-format
 msgid "Can not find account chart for this company, Please Create account."
 msgstr ""
+"Не удалось найти план счетов для компании. Пожалуйста, создайте счет."
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:0
 #, python-format
 msgid "Enter a Start date !"
-msgstr ""
+msgstr "Введите дату начала !"
 
 #. module: account
 #: report:account.invoice:0
@@ -5840,7 +5843,7 @@ msgstr "Возврат средств от поставщика"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_dashboard_acc
 msgid "Dashboard"
-msgstr ""
+msgstr "Инф. панель"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
@@ -5872,7 +5875,7 @@ msgstr "Централизация"
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: account
 #: field:account.journal.column,readonly:0
@@ -5882,7 +5885,7 @@ msgstr "Только чтение"
 #. module: account
 #: model:ir.model,name:account.model_account_pl_report
 msgid "Account Profit And Loss Report"
-msgstr ""
+msgstr "Отчет по счету прибыль и убыток"
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -5899,7 +5902,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
 msgid "account.sequence.fiscalyear"
-msgstr ""
+msgstr "account.sequence.fiscalyear"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -5935,7 +5938,7 @@ msgstr "Категория счета расходов"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Операции с наличными"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:0
diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po
index e7e61d6cf19..ffced0bfa69 100644
--- a/addons/account/i18n/sv.po
+++ b/addons/account/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-14 22:43+0000\n"
+"PO-Revision-Date: 2010-12-15 15:34+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -44,7 +44,7 @@ msgstr ""
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Gournal transaktion avstämning"
 
 #. module: account
 #: field:account.installer.modules,account_voucher:0
@@ -89,12 +89,12 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Periodiserad reskontra till dagens datum"
 
 #. module: account
 #: field:account.partner.ledger,reconcil:0
 msgid "Include Reconciled Entries"
-msgstr ""
+msgstr "Inkludera avstämda transaktioner"
 
 #. module: account
 #: view:account.pl.report:0
@@ -288,7 +288,7 @@ msgstr "Balansräkning"
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Manuellt återkommande"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -468,6 +468,9 @@ msgid ""
 "it comes to 'Printed' state. When all transactions are done, it comes in "
 "'Done' state."
 msgstr ""
+"När journalen skapades, Statusen är preliminär. När den skrivs ut blir "
+"statusen 'Utskriven'. När alla transaktioner är klara får journalen status "
+"'klar'."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -641,7 +644,7 @@ msgstr "Taxes Mapping"
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "Centraliserad journal"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -846,7 +849,7 @@ msgstr "Beräkning"
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner to reconcile"
-msgstr ""
+msgstr "Nästa partner som skall stämmas av"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -931,7 +934,7 @@ msgstr "Utökade filter..."
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Centraliserad journal"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -1051,7 +1054,7 @@ msgstr ""
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Tillämplighet alternativ"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1085,7 +1088,7 @@ msgstr "Chef"
 #. module: account
 #: view:account.subscription.generate:0
 msgid "Generate Entries before:"
-msgstr ""
+msgstr "Skapa transaktioner före:"
 
 #. module: account
 #: selection:account.bank.accounts.wizard,account_type:0
@@ -1100,7 +1103,7 @@ msgstr "Startdatum"
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Bekräfta utdraget"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po
index 84e4af04623..51839faf578 100644
--- a/addons/account/i18n/vi.po
+++ b/addons/account/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/installer.py b/addons/account/installer.py
index b1be04f7c70..9dce3186393 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -45,7 +45,7 @@ class account_installer(osv.osv_memory):
         ids = modules.search(cr, uid, [('category_id', '=', 'Account Charts')], context=context)
         charts = list(
             sorted(((m.name, m.shortdesc)
-                    for m in modules.browse(cr, uid, ids)),
+                    for m in modules.browse(cr, uid, ids, context=context)),
                    key=itemgetter(1)))
         charts.insert(0, ('configurable', 'Generic Chart Of Account'))
         return charts
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 3f675f90a07..57178c03c72 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -60,7 +60,7 @@ class account_invoice(osv.osv):
         return res and res[0] or False
 
     def _get_currency(self, cr, uid, context=None):
-        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid])[0]
+        user = pooler.get_pool(cr.dbname).get('res.users').browse(cr, uid, [uid], context=context)[0]
         if user.company_id:
             return user.company_id.currency_id.id
         return pooler.get_pool(cr.dbname).get('res.currency').search(cr, uid, [('rate','=', 1.0)])[0]
@@ -89,11 +89,11 @@ class account_invoice(osv.osv):
 
     def _amount_residual(self, cr, uid, ids, name, args, context=None):
         res = {}
-        cur_obj = self.pool.get('res.currency')
-        data_inv = self.browse(cr, uid, ids)
         if context is None:
             context = {}
 
+        cur_obj = self.pool.get('res.currency')
+        data_inv = self.browse(cr, uid, ids, context=context)
         for inv in data_inv:
             debit = credit = 0.0
             context.update({'date':inv.date_invoice})
@@ -168,7 +168,7 @@ class account_invoice(osv.osv):
 
     def _compute_lines(self, cr, uid, ids, name, args, context=None):
         result = {}
-        for invoice in self.browse(cr, uid, ids, context):
+        for invoice in self.browse(cr, uid, ids, context=context):
             src = []
             lines = []
             if invoice.move_id:
@@ -187,7 +187,7 @@ class account_invoice(osv.osv):
 
     def _get_invoice_from_line(self, cr, uid, ids, context=None):
         move = {}
-        for line in self.pool.get('account.move.line').browse(cr, uid, ids):
+        for line in self.pool.get('account.move.line').browse(cr, uid, ids, context=context):
             if line.reconcile_partial_id:
                 for line2 in line.reconcile_partial_id.line_partial_ids:
                     move[line2.move_id.id] = True
@@ -201,7 +201,7 @@ class account_invoice(osv.osv):
 
     def _get_invoice_from_reconcile(self, cr, uid, ids, context=None):
         move = {}
-        for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids):
+        for r in self.pool.get('account.move.reconcile').browse(cr, uid, ids, context=context):
             for line in r.line_partial_ids:
                 move[line.move_id.id] = True
             for line in r.line_id:
@@ -328,6 +328,7 @@ class account_invoice(osv.osv):
         journal_obj = self.pool.get('account.journal')
         if context is None:
             context = {}
+
         if context.get('active_model', '') in ['res.partner'] and context.get('active_ids', False) and context['active_ids']:
             partner = self.pool.get(context['active_model']).read(cr, uid, context['active_ids'], ['supplier','customer'])[0]
             if not view_type:
@@ -395,7 +396,7 @@ class account_invoice(osv.osv):
         return True
 
     def unlink(self, cr, uid, ids, context=None):
-        invoices = self.read(cr, uid, ids, ['state'])
+        invoices = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for t in invoices:
             if t['state'] in ('draft', 'cancel'):
@@ -675,7 +676,7 @@ class account_invoice(osv.osv):
 
     def button_compute(self, cr, uid, ids, context=None, set_total=False):
         self.button_reset_taxes(cr, uid, ids, context)
-        for inv in self.browse(cr, uid, ids):
+        for inv in self.browse(cr, uid, ids, context=context):
             if set_total:
                 self.pool.get('account.invoice').write(cr, uid, [inv.id], {'check_total': inv.amount_total})
         return True
@@ -987,7 +988,7 @@ class account_invoice(osv.osv):
         #TODO: not correct fix but required a frech values before reading it.
         self.write(cr, uid, ids, {})
 
-        for obj_inv in self.browse(cr, uid, ids):
+        for obj_inv in self.browse(cr, uid, ids, context=context):
             id = obj_inv.id
             invtype = obj_inv.type
             number = obj_inv.number
@@ -1155,7 +1156,7 @@ class account_invoice(osv.osv):
             context = {}
         #TODO check if we can use different period for payment and the writeoff line
         assert len(ids)==1, "Can only pay one invoice at a time"
-        invoice = self.browse(cr, uid, ids[0])
+        invoice = self.browse(cr, uid, ids[0], context=context)
         src_account_id = invoice.account_id.id
         # Take the seq as name for move
         types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1}
@@ -1319,9 +1320,9 @@ class account_invoice_line(osv.osv):
                 return {'value': {'categ_id': False}, 'domain':{'product_uom':[]}}
             else:
                 return {'value': {'price_unit': 0.0, 'categ_id': False}, 'domain':{'product_uom':[]}}
-        part = self.pool.get('res.partner').browse(cr, uid, partner_id)
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
         fpos_obj = self.pool.get('account.fiscal.position')
-        fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id) or False
+        fpos = fposition_id and fpos_obj.browse(cr, uid, fposition_id, context=context) or False
 
         if part.lang:
             context.update({'lang': part.lang})
@@ -1351,7 +1352,7 @@ class account_invoice_line(osv.osv):
                 # Parse the value_reference field to get the ID of the account.account record
                 account_id = int (my_value[0]["value_reference"].split(",")[1])
                 # Use the ID of the account.account record in the browse for the account.account record
-                app_acc_in = account_obj.browse(cr, uid, [account_id])[0]
+                app_acc_in = account_obj.browse(cr, uid, account_id, context=context)
             if not exp_pro_id:
                 ex_acc = res.product_tmpl_id.property_account_expense
                 ex_acc_cate = res.categ_id.property_account_expense_categ
@@ -1360,7 +1361,7 @@ class account_invoice_line(osv.osv):
                 else:
                     app_acc_exp = ex_acc_cate
             else:
-                app_acc_exp = account_obj.browse(cr, uid, exp_pro_id)[0]
+                app_acc_exp = account_obj.browse(cr, uid, exp_pro_id, context=context)[0]
             if not in_pro_id and not exp_pro_id:
                 in_acc = res.product_tmpl_id.property_account_income
                 in_acc_cate = res.categ_id.property_account_income_categ
@@ -1378,8 +1379,8 @@ class account_invoice_line(osv.osv):
                 if not in_res_id and not exp_res_id:
                     raise osv.except_osv(_('Configuration Error !'),
                         _('Can not find account chart for this company, Please Create account.'))
-                in_obj_acc = account_obj.browse(cr, uid, in_res_id)
-                exp_obj_acc = account_obj.browse(cr, uid, exp_res_id)
+                in_obj_acc = account_obj.browse(cr, uid, in_res_id, context=context)
+                exp_obj_acc = account_obj.browse(cr, uid, exp_res_id, context=context)
                 if in_acc or ex_acc:
                     res.product_tmpl_id.property_account_income = in_obj_acc[0]
                     res.product_tmpl_id.property_account_expense = exp_obj_acc[0]
@@ -1427,8 +1428,8 @@ class account_invoice_line(osv.osv):
         if not company_id or not currency_id:
             return res_final
 
-        company = self.pool.get('res.company').browse(cr, uid, company_id)
-        currency = self.pool.get('res.currency').browse(cr, uid, currency_id)
+        company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+        currency = self.pool.get('res.currency').browse(cr, uid, currency_id, context=context)
 
         if company.currency_id.id != currency.id:
             new_price = res_final['value']['price_unit'] * currency.rate
@@ -1453,7 +1454,9 @@ class account_invoice_line(osv.osv):
         res = []
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
-        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
+        if context is None:
+            context = {}
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
@@ -1584,11 +1587,11 @@ class account_invoice_tax(osv.osv):
         'base_amount': 0.0,
         'tax_amount': 0.0,
     }
-    def compute(self, cr, uid, invoice_id, context={}):
+    def compute(self, cr, uid, invoice_id, context=None):
         tax_grouped = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
-        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context)
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         cur = inv.currency_id
         company_currency = inv.company_id.currency_id.id
 
diff --git a/addons/account/partner.py b/addons/account/partner.py
index fb5af0353a5..c710e8949c4 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -34,7 +34,7 @@ class account_fiscal_position(osv.osv):
         'note': fields.text('Notes', translate=True),
     }
 
-    def map_tax(self, cr, uid, fposition_id, taxes, context={}):
+    def map_tax(self, cr, uid, fposition_id, taxes, context=None):
         if not taxes:
             return []
         if not fposition_id:
@@ -51,7 +51,7 @@ class account_fiscal_position(osv.osv):
                 result.append(t.id)
         return result
 
-    def map_account(self, cr, uid, fposition_id, account_id, context={}):
+    def map_account(self, cr, uid, fposition_id, account_id, context=None):
         if not fposition_id:
             return account_id
         for pos in fposition_id.account_ids:
@@ -134,10 +134,10 @@ class res_partner(osv.osv):
             return [('id','=','0')]
         return [('id','in',map(itemgetter(0), res))]
 
-    def _credit_search(self, cr, uid, obj, name, args, context):
+    def _credit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'receivable', args, context=context)
 
-    def _debit_search(self, cr, uid, obj, name, args, context):
+    def _debit_search(self, cr, uid, obj, name, args, context=None):
         return self._asset_difference_search(cr, uid, obj, name, 'payable', args, context=context)
 
     _columns = {
diff --git a/addons/account/project/wizard/project_account_analytic_line.py b/addons/account/project/wizard/project_account_analytic_line.py
index f99da966634..e6be3bcffd3 100644
--- a/addons/account/project/wizard/project_account_analytic_line.py
+++ b/addons/account/project/wizard/project_account_analytic_line.py
@@ -29,7 +29,7 @@ class project_account_analytic_line(osv.osv_memory):
          'to_date': fields.date('To'),
      }
 
-     def action_open_window(self, cr, uid, ids, context={}):
+     def action_open_window(self, cr, uid, ids, context=None):
           mod_obj =self.pool.get('ir.model.data')
           domain = []
           data = self.read(cr, uid, ids, [])[0]
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index a85d25efe5a..8a77ce47280 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -27,7 +27,7 @@ import pooler
 import tools
 from osv import fields,osv
 
-def _code_get(self, cr, uid, context={}):
+def _code_get(self, cr, uid, context=None):
     acc_type_obj = self.pool.get('account.account.type')
     ids = acc_type_obj.search(cr, uid, [])
     res = acc_type_obj.read(cr, uid, ids, ['code', 'name'], context)
@@ -98,9 +98,9 @@ class report_aged_receivable(osv.osv):
         res = super(report_aged_receivable, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         return res
 
-    def _calc_bal(self, cr, uid, ids, name, args, context):
+    def _calc_bal(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for period in self.read(cr,uid,ids,['name']):
+        for period in self.read(cr, uid, ids, ['name'], context=context):
            date1,date2 = period['name'].split(' to ')
            cr.execute("SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac  \
                         WHERE (line.account_id=ac.id) AND ac.type='receivable' \
diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py
index e1ef86b9a65..432a430868c 100644
--- a/addons/account/wizard/account_automatic_reconcile.py
+++ b/addons/account/wizard/account_automatic_reconcile.py
@@ -42,10 +42,14 @@ class account_automatic_reconcile(osv.osv_memory):
         'allow_write_off': fields.boolean('Allow write off')
     }
 
-    def _get_reconciled(self, cr, uid, context={}):
+    def _get_reconciled(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return context.get('reconciled', 0)
 
-    def _get_unreconciled(self, cr, uid, context={}):
+    def _get_unreconciled(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         return context.get('unreconciled', 0)
 
     _defaults = {
@@ -175,7 +179,7 @@ class account_automatic_reconcile(osv.osv_memory):
                     if allow_write_off:
                         move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context)
                     else:
-                        move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context={})
+                        move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context=context)
 
             # get the list of partners who have more than one unreconciled transaction
             cr.execute(
diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py
index b6dccb6e5b1..47f9ac9c2c8 100644
--- a/addons/account/wizard/account_change_currency.py
+++ b/addons/account/wizard/account_change_currency.py
@@ -51,7 +51,7 @@ class account_change_currency(osv.osv_memory):
         invoice = obj_inv.browse(cr, uid, context['active_id'], context=context)
         if invoice.currency_id.id == new_currency:
             return {}
-        rate = obj_currency.browse(cr, uid, new_currency).rate
+        rate = obj_currency.browse(cr, uid, new_currency, context=context).rate
         for line in invoice.invoice_line:
             new_price = 0
             if invoice.company_id.currency_id.id == invoice.currency_id.id:
diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py
index 0ad0cf61999..672e2a28fba 100644
--- a/addons/account/wizard/account_invoice_refund.py
+++ b/addons/account/wizard/account_invoice_refund.py
@@ -93,7 +93,7 @@ class account_invoice_refund(osv.osv_memory):
             date = False
             period = False
             description = False
-            company = res_users_obj.browse(cr, uid, uid).company_id
+            company = res_users_obj.browse(cr, uid, uid, context=context).company_id
             journal_id = form.get('journal_id', False)
             for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context):
                 if inv.state in ['draft', 'proforma2', 'cancel']:
diff --git a/addons/account/wizard/account_move_bank_reconcile.py b/addons/account/wizard/account_move_bank_reconcile.py
index 2e6a52e56cd..9be351ed440 100644
--- a/addons/account/wizard/account_move_bank_reconcile.py
+++ b/addons/account/wizard/account_move_bank_reconcile.py
@@ -32,13 +32,15 @@ class account_move_bank_reconcile(osv.osv_memory):
        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
     }
 
-    def action_open_window(self, cr, uid, ids, context={}):
+    def action_open_window(self, cr, uid, ids, context=None):
         """
        @param cr: the current row, from the database cursor,
        @param uid: the current user’s ID for security checks,
        @param ids: account move bank reconcile’s ID or list of IDs
        @return: dictionary of  Open  account move line   on given journal_id.
         """
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         cr.execute('select default_credit_account_id \
                         from account_journal where id=%s', (data['journal_id'],))
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 72ae65f83b9..c7adb387724 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -29,7 +29,7 @@ class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"
     _description = "Move journal"
 
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
         """
         Return  default account period value
         """
@@ -40,7 +40,7 @@ class account_move_journal(osv.osv_memory):
             period_id = ids[0]
         return period_id
 
-    def _get_journal(self, cr, uid, context={}):
+    def _get_journal(self, cr, uid, context=None):
         """
         Return journal based on the journal type
         """
@@ -138,8 +138,8 @@ class account_move_journal(osv.osv_memory):
             ids = period_pool.search(cr, uid, [('journal_id', '=', journal_id), ('period_id', '=', period_id)], context=context)
 
             if not ids:
-                journal = journal_pool.browse(cr, uid, journal_id)
-                period = account_period_obj.browse(cr, uid, period_id)
+                journal = journal_pool.browse(cr, uid, journal_id, context=context)
+                period = account_period_obj.browse(cr, uid, period_id, context=context)
 
                 name = journal.name
                 state = period.state
diff --git a/addons/account/wizard/account_move_line_reconcile_select.py b/addons/account/wizard/account_move_line_reconcile_select.py
index d51b78f8db4..8e57c57884d 100644
--- a/addons/account/wizard/account_move_line_reconcile_select.py
+++ b/addons/account/wizard/account_move_line_reconcile_select.py
@@ -30,7 +30,7 @@ class account_move_line_reconcile_select(osv.osv_memory):
                             domain = [('reconcile', '=', 1)], required=True),
     }
 
-    def action_open_window(self, cr, uid, ids, context={}):
+    def action_open_window(self, cr, uid, ids, context=None):
         """
         This function Open  account move line window for reconcile on given account id
         @param cr: the current row, from the database cursor,
diff --git a/addons/account/wizard/account_move_line_select.py b/addons/account/wizard/account_move_line_select.py
index 7ece00ca8b5..12ab0236759 100644
--- a/addons/account/wizard/account_move_line_select.py
+++ b/addons/account/wizard/account_move_line_select.py
@@ -42,7 +42,7 @@ class account_move_line_select(osv.osv_memory):
         else:
             fiscalyear_ids = [context['fiscalyear']]
 
-        fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids)
+        fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids, context=context)
 
         period_ids = []
         if fiscalyears:
diff --git a/addons/account/wizard/account_move_line_unreconcile_select.py b/addons/account/wizard/account_move_line_unreconcile_select.py
index 826a5a654b1..ad59493503d 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select.py
+++ b/addons/account/wizard/account_move_line_unreconcile_select.py
@@ -27,7 +27,7 @@ class account_move_line_unreconcile_select(osv.osv_memory):
     _columns ={
        'account_id': fields.many2one('account.account','Account',required=True),
     }
-    def action_open_window(self, cr, uid, ids, context={}):
+    def action_open_window(self, cr, uid, ids, context=None):
         data = self.read(cr, uid, ids, context=context)[0]
         return {
                 'domain': "[('account_id','=',%d),('reconcile_id','<>',False),('state','<>','draft')]" % data['account_id'],
diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py
index 3b7dc0743fc..582bbc36619 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear.py
+++ b/addons/account/wizard/account_open_closed_fiscalyear.py
@@ -30,12 +30,12 @@ class account_open_closed_fiscalyear(osv.osv_memory):
                                  'Fiscal Year to Open', required=True, help='Select Fiscal Year which you want to remove entries for its End of year entries journal'),
     }
 
-    def remove_entries(self, cr, uid, ids, context={}):
+    def remove_entries(self, cr, uid, ids, context=None):
         fy_obj = self.pool.get('account.fiscalyear')
         move_obj = self.pool.get('account.move')
 
-        data = self.read(cr, uid, ids, [])[0]
-        data_fyear = fy_obj.browse(cr, uid, data['fyear_id'])
+        data = self.read(cr, uid, ids, [], context=context)[0]
+        data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context)
         if not data_fyear.end_journal_period_id:
             raise osv.except_osv(_('Error'), _('No journal for ending writing has been defined for the fiscal year'))
         period_journal = data_fyear.end_journal_period_id
diff --git a/addons/account/wizard/account_reconcile_partner_process.py b/addons/account/wizard/account_reconcile_partner_process.py
index e65ed778ef4..9f91d1ec2d2 100644
--- a/addons/account/wizard/account_reconcile_partner_process.py
+++ b/addons/account/wizard/account_reconcile_partner_process.py
@@ -73,6 +73,8 @@ class account_partner_reconcile_process(osv.osv_memory):
         return res
 
     def next_partner(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         move_line_obj = self.pool.get('account.move.line')
         res_partner_obj = self.pool.get('res.partner')
 
diff --git a/addons/account/wizard/account_report_balance_sheet.py b/addons/account/wizard/account_report_balance_sheet.py
index 0d64a753f55..6ce36242f47 100644
--- a/addons/account/wizard/account_report_balance_sheet.py
+++ b/addons/account/wizard/account_report_balance_sheet.py
@@ -57,7 +57,7 @@ class account_bs_report(osv.osv_memory):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'])
+        account = self.pool.get('account.account').browse(cr, uid, data['form']['chart_account_id'], context=context)
         if not account.company_id.property_reserve_and_surplus_account:
             raise osv.except_osv(_('Warning'),_('Please define the Reserve and Profit/Loss account for current user company !'))
         data['form']['reserve_account_id'] = account.company_id.property_reserve_and_surplus_account.id
diff --git a/addons/account/wizard/account_report_common_account.py b/addons/account/wizard/account_report_common_account.py
index 4ed71ec9389..7205a9e53bf 100644
--- a/addons/account/wizard/account_report_common_account.py
+++ b/addons/account/wizard/account_report_common_account.py
@@ -38,7 +38,7 @@ class account_common_account_report(osv.osv_memory):
     def pre_print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
-        data['form'].update(self.read(cr, uid, ids, ['display_account'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['display_account'], context=context)[0])
         return data
 
 account_common_account_report()
diff --git a/addons/account/wizard/account_report_common_journal.py b/addons/account/wizard/account_report_common_journal.py
index 9ec12b16177..8e9db058d31 100644
--- a/addons/account/wizard/account_report_common_journal.py
+++ b/addons/account/wizard/account_report_common_journal.py
@@ -41,7 +41,7 @@ class account_common_journal_report(osv.osv_memory):
     def pre_print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
-        data['form'].update(self.read(cr, uid, ids, ['amount_currency'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['amount_currency'], context=context)[0])
         fy_ids = data['form']['fiscalyear_id'] and [data['form']['fiscalyear_id']] or self.pool.get('account.fiscalyear').search(cr, uid, [('state', '=', 'draft')], context=context)
         period_list = data['form']['periods'] or self.pool.get('account.period').search(cr, uid, [('fiscalyear_id', 'in', fy_ids)], context=context)
         data['form']['active_ids'] = self.pool.get('account.journal.period').search(cr, uid, [('journal_id', 'in', data['form']['journal_ids']), ('period_id', 'in', period_list)], context=context)
diff --git a/addons/account/wizard/account_report_common_partner.py b/addons/account/wizard/account_report_common_partner.py
index 3fafb400bb1..05003041eeb 100644
--- a/addons/account/wizard/account_report_common_partner.py
+++ b/addons/account/wizard/account_report_common_partner.py
@@ -39,7 +39,7 @@ class account_common_partner_report(osv.osv_memory):
     def pre_print_report(self, cr, uid, ids, data, context=None):
         if context is None:
             context = {}
-        data['form'].update(self.read(cr, uid, ids, ['result_selection'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['result_selection'], context=context)[0])
         return data
 
 account_common_partner_report()
diff --git a/addons/account/wizard/account_report_print_journal.py b/addons/account/wizard/account_report_print_journal.py
index 6256cca8ab6..b1ca30dc560 100644
--- a/addons/account/wizard/account_report_print_journal.py
+++ b/addons/account/wizard/account_report_print_journal.py
@@ -39,7 +39,7 @@ class account_print_journal(osv.osv_memory):
         if context is None:
             context = {}
         data = self.pre_print_report(cr, uid, ids, data, context=context)
-        data['form'].update(self.read(cr, uid, ids, ['sort_selection'])[0])
+        data['form'].update(self.read(cr, uid, ids, ['sort_selection'], context=context)[0])
         return {'type': 'ir.actions.report.xml', 'report_name': 'account.journal.period.print', 'datas': data}
 
 account_print_journal()
diff --git a/addons/account/wizard/account_subscription_generate.py b/addons/account/wizard/account_subscription_generate.py
index 7a50b49d310..4c99539301b 100644
--- a/addons/account/wizard/account_subscription_generate.py
+++ b/addons/account/wizard/account_subscription_generate.py
@@ -33,7 +33,7 @@ class account_subscription_generate(osv.osv_memory):
     _defaults = {
         'date': lambda *a: time.strftime('%Y-%m-%d'),
     }
-    def action_generate(self, cr, uid, ids, context={}):
+    def action_generate(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         moves_created=[]
diff --git a/addons/account/wizard/account_unreconcile.py b/addons/account/wizard/account_unreconcile.py
index 88b58b68a1e..3a067b4a598 100644
--- a/addons/account/wizard/account_unreconcile.py
+++ b/addons/account/wizard/account_unreconcile.py
@@ -41,11 +41,11 @@ class account_unreconcile_reconcile(osv.osv_memory):
 
     def trans_unrec_reconcile(self, cr, uid, ids, context=None):
         obj_move_reconcile = self.pool.get('account.move.reconcile')
-        rec_ids = context['active_ids']
         if context is None:
             context = {}
+        rec_ids = context['active_ids']
         if rec_ids:
-            obj_move_reconcile.unlink(cr, uid, rec_ids)
+            obj_move_reconcile.unlink(cr, uid, rec_ids, context=context)
         return {}
 
 account_unreconcile_reconcile()
diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py
index 51bd3a96083..15719dcf138 100644
--- a/addons/account/wizard/account_use_model.py
+++ b/addons/account/wizard/account_use_model.py
@@ -59,9 +59,9 @@ class account_use_model(osv.osv_memory):
         data =  self.read(cr, uid, ids, context=context)[0]
         record_id = context and context.get('model_line', False) or False
         if record_id:
-            data_model = account_model_obj.browse(cr, uid, data['model'])
+            data_model = account_model_obj.browse(cr, uid, data['model'], context=context)
         else:
-            data_model = account_model_obj.browse(cr, uid, context['active_ids'])
+            data_model = account_model_obj.browse(cr, uid, context['active_ids'], context=context)
         for model in data_model:
             entry['name'] = model.name%{'year':time.strftime('%Y'), 'month':time.strftime('%m'), 'date':time.strftime('%d')}
             period_id = account_period_obj.find(cr, uid, context=context)
diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py
index 0f963b44fa6..f840d2b5532 100644
--- a/addons/account/wizard/account_validate_account_move.py
+++ b/addons/account/wizard/account_validate_account_move.py
@@ -33,11 +33,11 @@ class validate_account_move(osv.osv_memory):
         obj_move = self.pool.get('account.move')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids)[0]
+        data = self.read(cr, uid, ids, context=context)[0]
         ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])])
         if not ids_move:
             raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period'))
-        obj_move.button_validate(cr, uid, ids_move, context)
+        obj_move.button_validate(cr, uid, ids_move, context=context)
         return {}
 
 validate_account_move()
diff --git a/addons/account_accountant/i18n/account_accountant.pot b/addons/account_accountant/i18n/account_accountant.pot
index aa0759e1c4e..43c1c0b6236 100644
--- a/addons/account_accountant/i18n/account_accountant.pot
+++ b/addons/account_accountant/i18n/account_accountant.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:14:45+0000\n"
-"PO-Revision-Date: 2010-12-10 17:14:45+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:35+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:35+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 55213155168..9c8d657d537 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -269,7 +269,7 @@ class account_analytic_account(osv.osv):
                     GROUP BY account_analytic_line.account_id", (child_ids,))
             for account_id, sum in cr.fetchall():
                 res[account_id][name] = round(sum,2)
-        data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context)
+        data = self._compute_level_tree(cr, uid, ids, child_ids, res, [name], context=context)
         for i in data:
             res_final[i] = data[i][name]
         return res_final
@@ -324,7 +324,7 @@ class account_analytic_account(osv.osv):
 
     def _revenue_per_hour_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             if account.hours_qtt_invoiced == 0:
                 res[account.id]=0.0
             else:
@@ -335,7 +335,7 @@ class account_analytic_account(osv.osv):
 
     def _real_margin_rate_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             if account.ca_invoiced == 0:
                 res[account.id]=0.0
             elif account.total_cost != 0.0:
@@ -348,7 +348,7 @@ class account_analytic_account(osv.osv):
 
     def _remaining_ca_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             if account.amount_max != 0:
                 res[account.id] = account.amount_max - account.ca_invoiced
             else:
@@ -359,7 +359,7 @@ class account_analytic_account(osv.osv):
 
     def _real_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = account.ca_invoiced + account.total_cost
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
@@ -367,7 +367,7 @@ class account_analytic_account(osv.osv):
 
     def _theorical_margin_calc(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for account in self.browse(cr, uid, ids):
+        for account in self.browse(cr, uid, ids, context=context):
             res[account.id] = account.ca_theorical + account.total_cost
         for id in ids:
             res[id] = round(res.get(id, 0.0),2)
@@ -497,7 +497,7 @@ class account_analytic_account_summary_user(osv.osv):
                 ')')
 
     def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
-        if not context:
+        if context is None:
             context = {}
         if not ids:
             return []
@@ -671,7 +671,7 @@ class account_analytic_account_summary_month(osv.osv):
                 ')')
 
     def _read_flat(self, cr, user, ids, fields, context=None, load='_classic_read'):
-        if not context:
+        if context is None:
             context = {}
         if not ids:
             return []
diff --git a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
index 03e09f3cfb6..3b7199e52b5 100644
--- a/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
+++ b/addons/account_analytic_analysis/i18n/account_analytic_analysis.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:50+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:50+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_analytic_default/i18n/account_analytic_default.pot b/addons/account_analytic_default/i18n/account_analytic_default.pot
index f1547e4cf54..82d696158ae 100644
--- a/addons/account_analytic_default/i18n/account_analytic_default.pot
+++ b/addons/account_analytic_default/i18n/account_analytic_default.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:50+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:50+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:36+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:36+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py
index fa3e4a24635..6d8a06755d6 100644
--- a/addons/account_analytic_plans/account_analytic_plans.py
+++ b/addons/account_analytic_plans/account_analytic_plans.py
@@ -28,7 +28,7 @@ from tools.translate import _
 
 class one2many_mod2(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
+        if context is None:
             context = {}
         res = {}
         for id in ids:
@@ -115,7 +115,7 @@ class account_analytic_plan_instance(osv.osv):
         return super(account_analytic_plan_instance, self).copy(cr, uid, id, default, context=context)
 
     def _default_journal(self, cr, uid, context=None):
-        if not context:
+        if context is None:
             context = {}
         journal_obj = self.pool.get('account.journal')
         if context.has_key('journal_id') and context['journal_id']:
@@ -148,6 +148,8 @@ class account_analytic_plan_instance(osv.osv):
         return self.name_get(cr, uid, ids, context or {})
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
         wiz_id = self.pool.get('ir.actions.act_window').search(cr, uid, [("name","=","analytic.plan.create.model.action")], context=context)
         res = super(account_analytic_plan_instance,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         journal_obj = self.pool.get('account.journal')
@@ -214,6 +216,8 @@ class account_analytic_plan_instance(osv.osv):
         return super(account_analytic_plan_instance, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        if context is None:
+            context = {}
         this = self.browse(cr, uid, ids[0], context=context)
         invoice_line_obj = self.pool.get('account.invoice.line')
         if this.plan_id and not vals.has_key('plan_id'):
@@ -307,6 +311,8 @@ class account_move_line(osv.osv):
         return data
 
     def create_analytic_lines(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         super(account_move_line, self).create_analytic_lines(cr, uid, ids, context=context)
         analytic_line_obj = self.pool.get('account.analytic.line')
         for line in self.browse(cr, uid, ids, context=context):
@@ -336,7 +342,9 @@ class account_move_line(osv.osv):
                    analytic_line_obj.create(cr, uid, al_vals, context=context)
         return True
 
-    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False, submenu=False):
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
+        if context is None:
+            context = {}
         result = super(osv.osv, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu)
         return result
 
@@ -437,7 +445,7 @@ class account_bank_statement(osv.osv):
     def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, st_line_number, context=None):
         account_move_line_pool = self.pool.get('account.move.line')
         account_bank_statement_line_pool = self.pool.get('account.bank.statement.line')
-        st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context)
+        st_line = account_bank_statement_line_pool.browse(cr, uid, st_line_id, context=context)
         result = super(account_bank_statement,self).create_move_from_st_line(cr, uid, st_line_id, company_currency_id, st_line_number, context=context)
         move = st_line.move_ids and st_line.move_ids[0] or False
         if move:
@@ -447,7 +455,7 @@ class account_bank_statement(osv.osv):
 
     def button_confirm_bank(self, cr, uid, ids, context=None):
         super(account_bank_statement,self).button_confirm_bank(cr, uid, ids, context=context)
-        for st in self.browse(cr, uid, ids, context):
+        for st in self.browse(cr, uid, ids, context=context):
             for st_line in st.line_ids:
                 if st_line.analytics_id:
                     if not st.journal_id.analytic_journal_id:
diff --git a/addons/account_analytic_plans/i18n/account_analytic_plans.pot b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
index 26980ed8f0b..60fe4bf9f86 100644
--- a/addons/account_analytic_plans/i18n/account_analytic_plans.pot
+++ b/addons/account_analytic_plans/i18n/account_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:14:47+0000\n"
-"PO-Revision-Date: 2010-12-10 17:14:47+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,18 +16,8 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_analytic_plans
-#: view:analytic.plan.create.model:0
-msgid "This distribution model has been saved.You will be able to reuse it later."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,plan_id:0
-msgid "Plan Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "From Date"
+#: field:account.analytic.plan.instance,account4_ids:0
+msgid "Account4 Id"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -38,6 +28,26 @@ msgstr ""
 msgid "Crossovered Analytic"
 msgstr ""
 
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account5_ids:0
+msgid "Account5 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date2:0
+msgid "End Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account3_ids:0
+msgid "Account3 Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
 #: field:account.analytic.plan,name:0
@@ -49,8 +59,95 @@ msgid "Analytic Plan"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
-msgid "Multiple-plans management in Analytic Accounting"
+#: view:analytic.plan.create.model:0
+msgid "This distribution model has been saved.You will be able to reuse it later."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Please put a name and a code before saving the model !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
+msgid "Analytic Instance Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.crossovered.analytic:0
+msgid "Print"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "To Date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance.line,plan_id:0
+msgid "Plan Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
+msgid "Analytic Distribution's Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Account Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:account.analytic.plan.instance.line:0
+msgid "Analytic Distribution Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,code:0
+msgid "Distribution Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Percentage"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Printing date"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_sale_order_line
+msgid "Sale Order Line"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,empty_line:0
+msgid "Dont show empty lines"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
+msgid "analytic.plan.create.model.action"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "A model having this name and code already exists !"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -60,128 +157,27 @@ msgstr ""
 msgid "Analytic Journal"
 msgstr ""
 
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "100.00%"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account :"
+msgstr ""
+
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line
 msgid "Analytic Plan Line"
 msgstr ""
 
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
-msgid "Analytic Plan Instance"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:analytic.plan.create.model:0
-msgid "Ok"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,plan_id:0
-msgid "Model's Plan"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account2_ids:0
-msgid "Account2 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account_ids:0
-msgid "Account Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Amount"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.move.line:0
-msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account6_ids:0
-msgid "Account6 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
-msgid "Multi Plans"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
-msgid "Bank Statement Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,analytic_account_id:0
-msgid "Analytic Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,ref:0
-msgid "Analytic Account Reference"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "You can not create move line on receivable/payable account without partner"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Printing date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action
-msgid "Analytic Distribution's Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-msgid "Print"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Percentage"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_sale_order_line
-msgid "Sale Order Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "A model having this name and code already exists !"
-msgstr ""
-
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
 #, python-format
@@ -189,8 +185,30 @@ msgid "No analytic plan defined !"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance.line,rate:0
-msgid "Rate (%)"
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Analytic Account Reference:"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,name:0
+msgid "Plan Name"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan,default_instance_id:0
+msgid "Default Entries"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
+#, python-format
+msgid "Error"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -206,11 +224,36 @@ msgstr ""
 msgid "User Error"
 msgstr ""
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
+msgid "analytic.plan.create.model"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account1_ids:0
+msgid "Account1 Id"
+msgstr ""
+
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,max_required:0
 msgid "Maximum Allowed (%)"
 msgstr ""
 
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,root_analytic_id:0
+msgid "Root Account"
+msgstr ""
+
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
 #: view:analytic.plan.create.model:0
@@ -218,75 +261,80 @@ msgstr ""
 msgid "Distribution Model Saved"
 msgstr ""
 
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance
+msgid "Analytic Plan Instance"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
+msgid "Distribution Models"
+msgstr ""
+
+#. module: account_analytic_plans
+#: view:analytic.plan.create.model:0
+msgid "Ok"
+msgstr ""
+
+#. module: account_analytic_plans
+#: constraint:account.move.line:0
+msgid "You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
+msgid "Multiple-plans management in Analytic Accounting"
+msgstr ""
+
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
 msgid "Analytic Plan Lines"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
-msgid "Invoice Line"
+#: field:account.analytic.plan.line,min_required:0
+msgid "Minimum Allowed (%)"
 msgstr ""
 
 #. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Currency"
+#: field:account.analytic.plan.instance,plan_id:0
+msgid "Model's Plan"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.crossovered.analytic,date1:0
-msgid "Start Date"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Company"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account5_ids:0
-msgid "Account5 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line
-msgid "Analytic Instance Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,root_analytic_id:0
-msgid "Root Account"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "To Date"
+#: field:account.analytic.plan.instance,account2_ids:0
+msgid "Account2 Id"
 msgstr ""
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
-msgid "You have to define an analytic journal on the '%s' journal!"
+msgid "The Total Should be Between %s and %s"
 msgstr ""
 
 #. module: account_analytic_plans
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.crossovered.analytic,empty_line:0
-msgid "Dont show empty lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
-msgid "analytic.plan.create.model.action"
+#: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
+msgid "Bank Statement Line"
 msgstr ""
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account :"
+msgid "Amount"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
+msgid "Print Crossovered Analytic"
+msgstr ""
+
+#. module: account_analytic_plans
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.analytic.plan.instance,account6_ids:0
+msgid "Account6 Id"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -323,53 +371,6 @@ msgid "This module allows to use several analytic plans, according to the genera
 "        "
 msgstr ""
 
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Analytic Account Reference:"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,name:0
-msgid "Plan Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan,default_instance_id:0
-msgid "Default Entries"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_move_line
-msgid "Journal Items"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account1_ids:0
-msgid "Account1 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,min_required:0
-msgid "Minimum Allowed (%)"
-msgstr ""
-
-#. module: account_analytic_plans
-#: help:account.analytic.plan.line,root_analytic_id:0
-msgid "Root account of this plan."
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Error"
-msgstr ""
-
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
@@ -381,14 +382,29 @@ msgid "Quantity"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
-#, python-format
-msgid "Please put a name and a code before saving the model !"
+#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
+msgid "Multi Plans"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic
-msgid "Print Crossovered Analytic"
+#: field:account.analytic.plan.instance,account_ids:0
+msgid "Account Id"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Code"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_analytic_plans
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "You have to define an analytic journal on the '%s' journal!"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -397,66 +413,24 @@ msgstr ""
 msgid "No Analytic Journal !"
 msgstr ""
 
+#. module: account_analytic_plans
+#: field:account.analytic.plan.line,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: account_analytic_plans
+#: model:ir.model,name:account_analytic_plans.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account3_ids:0
-msgid "Account3 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.crossovered.analytic:0
-#: view:analytic.plan.create.model:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,account4_ids:0
-msgid "Account4 Id"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Lines"
-msgstr ""
-
-#. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "The Total Should be Between %s and %s"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "at"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "Account Name"
-msgstr ""
-
-#. module: account_analytic_plans
-#: view:account.analytic.plan.instance.line:0
-msgid "Analytic Distribution Line"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.instance,code:0
-msgid "Distribution Code"
-msgstr ""
-
-#. module: account_analytic_plans
-#: report:account.analytic.account.crossovered.analytic:0
-msgid "100.00%"
+#: field:account.analytic.plan.instance.line,analytic_account_id:0
+msgid "Analytic Account"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -471,39 +445,40 @@ msgid "Analytic Distribution"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_account_journal
-msgid "Journal"
+#: code:addons/account_analytic_plans/account_analytic_plans.py:0
+#, python-format
+msgid "Value Error"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
-msgid "analytic.plan.create.model"
+#: help:account.analytic.plan.line,root_analytic_id:0
+msgid "Root account of this plan."
 msgstr ""
 
 #. module: account_analytic_plans
-#: field:account.crossovered.analytic,date2:0
-msgid "End Date"
+#: field:account.crossovered.analytic,ref:0
+msgid "Analytic Account Reference"
 msgstr ""
 
 #. module: account_analytic_plans
-#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open
-msgid "Distribution Models"
-msgstr ""
-
-#. module: account_analytic_plans
-#: field:account.analytic.plan.line,sequence:0
-msgid "Sequence"
+#: model:ir.model,name:account_analytic_plans.model_account_invoice
+msgid "Invoice"
 msgstr ""
 
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
-msgid "The name of the journal must be unique per company !"
+msgid "The code of the journal must be unique per company !"
 msgstr ""
 
 #. module: account_analytic_plans
-#: code:addons/account_analytic_plans/account_analytic_plans.py:0
-#, python-format
-msgid "Value Error"
+#: view:account.crossovered.analytic:0
+#: view:analytic.plan.create.model:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_analytic_plans
+#: field:account.crossovered.analytic,date1:0
+msgid "Start Date"
 msgstr ""
 
 #. module: account_analytic_plans
@@ -511,3 +486,18 @@ msgstr ""
 msgid "You can not create move line on view account."
 msgstr ""
 
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "at"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "Company"
+msgstr ""
+
+#. module: account_analytic_plans
+#: report:account.analytic.account.crossovered.analytic:0
+msgid "From Date"
+msgstr ""
+
diff --git a/addons/account_analytic_plans/i18n/es.po b/addons/account_analytic_plans/i18n/es.po
index 909b3f2291f..c8e700e0e7d 100644
--- a/addons/account_analytic_plans/i18n/es.po
+++ b/addons/account_analytic_plans/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-09 11:08+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 22:15+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -133,7 +132,7 @@ msgstr "Línea extracto bancario"
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Error: La referencia BVR es necesaria."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -279,7 +278,7 @@ msgstr "¡Debe definir un diario analítico en el diario '%s'!"
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Error: Número BVR no válido (checksum erróneo)."
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 0caef434c56..4687328e245 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-09 11:29+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-15 20:24+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -113,7 +114,7 @@ msgstr "Code"
 #. module: account_analytic_plans
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valeur erronée au crédit ou au débit de l'écriture comptable !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -133,7 +134,7 @@ msgstr "Ligne de relevé de banque"
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Erreur: la référence BVR est requise."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -143,7 +144,7 @@ msgstr "Compte analytique"
 #. module: account_analytic_plans
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Le code du journal doit être unique dans chaque société !"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
@@ -155,6 +156,8 @@ msgstr "Référence du compte analytique"
 msgid ""
 "You can not create move line on receivable/payable account without partner"
 msgstr ""
+"Vous ne pouvez pas créer de lignes d'écriture sur un compte client "
+"débiteur/fournisseur créditeur sans partenaire"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -277,7 +280,7 @@ msgstr "Vous devez définir un journal analytique sur le journal '%s' !"
 #. module: account_analytic_plans
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -395,7 +398,7 @@ msgstr "Identifiant du Compte1"
 #. module: account_analytic_plans
 #: constraint:account.move.line:0
 msgid "Company must be same for its related account and period."
-msgstr ""
+msgstr "La société doit être la même pour les comptes et périodes liées."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,min_required:0
@@ -554,6 +557,7 @@ msgstr "Erreur de valeur"
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
 msgstr ""
+"Vous ne pouvez pas créer de ligne d'écriture sur un compte de type \"Vue\"."
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/account_analytic_plans/i18n/pt.po b/addons/account_analytic_plans/i18n/pt.po
index 37a897acecf..e5bf4cd4e33 100644
--- a/addons/account_analytic_plans/i18n/pt.po
+++ b/addons/account_analytic_plans/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
index 777421798cd..0581197aaca 100644
--- a/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
+++ b/addons/account_analytic_plans/wizard/analytic_plan_create_model.py
@@ -30,6 +30,8 @@ class analytic_plan_create_model(osv.osv_memory):
         plan_obj = self.pool.get('account.analytic.plan.instance')
         mod_obj = self.pool.get('ir.model.data')
         anlytic_plan_obj = self.pool.get('account.analytic.plan')
+        if context is None:
+            context = {}
         if 'active_id' in context and context['active_id']:
             plan = plan_obj.browse(cr, uid, context['active_id'], context=context)
             if (not plan.name) or (not plan.code):
diff --git a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
index 91f00a12acc..4c490b924f1 100644
--- a/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
+++ b/addons/account_anglo_saxon/i18n/account_anglo_saxon.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:51+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:51+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:37+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
index 989301efa70..1b2a8a7629b 100644
--- a/addons/account_anglo_saxon/i18n/fr.po
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 08:35+0000\n"
+"PO-Revision-Date: 2010-12-15 20:26+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
@@ -26,18 +26,20 @@ msgstr "Catégorie de produit"
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr ""
+msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de catégorie récursive."
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Erreur: l'UdM par défaut et l'UdM d'achat doivent appartenir à la même "
+"catégorie."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_anglo_saxon/i18n/nl.po b/addons/account_anglo_saxon/i18n/nl.po
index 8d19dc00e7d..62fe23bc907 100644
--- a/addons/account_anglo_saxon/i18n/nl.po
+++ b/addons/account_anglo_saxon/i18n/nl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-11-26 12:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 14:28+0000\n"
+"Last-Translator: Jan Verlaan (Veritos) <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
@@ -26,17 +26,20 @@ msgstr "Productcategorie"
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
 msgstr ""
+"Fout: Verkoopeenheid moet in een andere categorie staan dan de maateenheid"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
 msgid "Error ! You can not create recursive categories."
-msgstr ""
+msgstr "Fout ! U kunt geen recursieve categorieën aanmaken."
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
 msgid ""
 "Error: The default UOM and the purchase UOM must be in the same category."
 msgstr ""
+"Fout: de standaard meeteenheid en de inkoop-meeteenheid moeten in de zelfde "
+"categorie liggen."
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
diff --git a/addons/account_anglo_saxon/i18n/pt.po b/addons/account_anglo_saxon/i18n/pt.po
index bc6913bad7e..aabfa63709d 100644
--- a/addons/account_anglo_saxon/i18n/pt.po
+++ b/addons/account_anglo_saxon/i18n/pt.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index ff356547a83..a0aab8298dc 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -27,8 +27,8 @@ class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
     
     def move_line_get(self, cr, uid, invoice_id, context=None):
-        res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context)
-        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
+        res = super(account_invoice_line,self).move_line_get(cr, uid, invoice_id, context=context)
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         if inv.type in ('out_invoice','out_refund'):
             for i_line in inv.invoice_line:
                 if i_line.product_id:
@@ -144,7 +144,7 @@ class account_invoice_line(osv.osv):
                 if not oa:
                     oa = product_obj.categ_id.property_stock_account_output_categ and product_obj.categ_id.property_stock_account_output_categ.id
             if oa:
-                fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id) or False
+                fpos = fposition_id and self.pool.get('account.fiscal.position').browse(cr, uid, fposition_id, context=context) or False
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, oa)
                 res['value'].update({'account_id':a})            
         return res
diff --git a/addons/account_anglo_saxon/stock.py b/addons/account_anglo_saxon/stock.py
index 6b0f367abf0..a544b9a6e2a 100644
--- a/addons/account_anglo_saxon/stock.py
+++ b/addons/account_anglo_saxon/stock.py
@@ -31,7 +31,7 @@ class stock_picking(osv.osv):
     def action_invoice_create(self, cr, uid, ids, journal_id=False,
             group=False, type='out_invoice', context=None):
         '''Return ids of created invoices for the pickings'''
-        res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context)
+        res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context=context)
         if type == 'in_refund':
             for inv in self.pool.get('account.invoice').browse(cr, uid, res.values(), context=context):
                 for ol in inv.invoice_line:
diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py
index 87b7573a68a..f6e7c7e3990 100644
--- a/addons/account_budget/account_budget.py
+++ b/addons/account_budget/account_budget.py
@@ -108,10 +108,12 @@ crossovered_budget()
 
 class crossovered_budget_lines(osv.osv):
 
-    def _prac_amt(self, cr, uid, ids, context={}):
+    def _prac_amt(self, cr, uid, ids, context=None):
         res = {}
         result = 0.0
-        for line in self.browse(cr, uid, ids):
+        if context is None: 
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
             acc_ids = [x.id for x in line.general_budget_id.account_ids]
             if not acc_ids:
                 raise osv.except_osv(_('Error!'),_("The General Budget '%s' has no Accounts!") % str(line.general_budget_id.name))
@@ -131,15 +133,17 @@ class crossovered_budget_lines(osv.osv):
             res[line.id] = result
         return res
 
-    def _prac(self, cr, uid, ids, name, args, context):
+    def _prac(self, cr, uid, ids, name, args, context=None):
         res={}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = self._prac_amt(cr, uid, [line.id], context=context)[line.id]
         return res
 
-    def _theo_amt(self, cr, uid, ids, context={}):
+    def _theo_amt(self, cr, uid, ids, context=None):
         res = {}
-        for line in self.browse(cr, uid, ids):
+        if context is None: 
+            context = {}
+        for line in self.browse(cr, uid, ids, context=context):
             today = datetime.datetime.today()
             date_to = today.strftime("%Y-%m-%d")
             date_from = line.date_from
@@ -167,15 +171,15 @@ class crossovered_budget_lines(osv.osv):
             res[line.id] = theo_amt
         return res
 
-    def _theo(self, cr, uid, ids, name, args, context):
+    def _theo(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = self._theo_amt(cr, uid, [line.id], context=context)[line.id]
         return res
 
-    def _perc(self, cr, uid, ids, name, args, context):
+    def _perc(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.theoritical_amount <> 0.00:
                 res[line.id] = float(line.practical_amount or 0.0 / line.theoritical_amount) * 100
             else:
diff --git a/addons/account_budget/i18n/account_budget.pot b/addons/account_budget/i18n/account_budget.pot
index 40d9533a0f2..98dd022769e 100644
--- a/addons/account_budget/i18n/account_budget.pot
+++ b/addons/account_budget/i18n/account_budget.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:52+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:52+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_budget/i18n/es.po b/addons/account_budget/i18n/es.po
index 6bb747145ad..4ca2fcf3ed3 100644
--- a/addons/account_budget/i18n/es.po
+++ b/addons/account_budget/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-09 07:28+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 22:19+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -51,6 +50,15 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"Un presupuesto es una previsión de ingresos y gastos esperados de su empresa "
+"durante un período futuro. Con un presupuesto, una empresa es capaz de mirar "
+"cuidadosamente la cantidad de dinero que manejará durante un período "
+"determinado, y decidir la mejor manera de dividirlo entre diferentes "
+"categorías. Llevando el seguimiento de dónde va su dinero, usted puede ser "
+"menos propenso a gastar en exceso, y tiene más probabilidades de alcanzar "
+"sus metas financieras. Programe un presupuesto detallando los ingresos "
+"previstos por cuenta analítica y controle su evolución sobre la base de los "
+"datos reales ejecutados durante ese período."
 
 #. module: account_budget
 #: view:crossovered.budget:0
diff --git a/addons/account_budget/i18n/fr.po b/addons/account_budget/i18n/fr.po
index eb0b942fa3d..dee719af0b6 100644
--- a/addons/account_budget/i18n/fr.po
+++ b/addons/account_budget/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-11-24 09:39+0000\n"
+"PO-Revision-Date: 2010-12-15 20:29+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -50,6 +50,15 @@ msgid ""
 "revenue per analytic account and monitor its evolution based on the actuals "
 "realised during that period."
 msgstr ""
+"Un budget est une prévision des revenus et des dépenses de l'entreprise sur "
+"une période dans le futur. Avec un budget, une société est capable de voir "
+"attentivement sur combien d'argent elle peut compter pendant une période "
+"donnée, et trouver la meilleure façon de le partager sur plusieurs "
+"catégories. En gardant une trace d'où l'argent va, vous serez probablement "
+"en mesure de réduire les dépassements et également d'atteindre vos objectifs "
+"financiers. Prévoyez un budget en détaillant les revenus espérés par comptes "
+"analytiques et surveillez leur évolution en se basant sur les dépenses "
+"réelles au cours de cette période."
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -141,7 +150,7 @@ msgstr "Description"
 #. module: account_budget
 #: report:crossovered.budget.report:0
 msgid "Currency"
-msgstr ""
+msgstr "Devise"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -188,7 +197,7 @@ msgstr "Terminé"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Total réel"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -318,7 +327,7 @@ msgstr "Début de la période"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "Rapport résumé du budget croisé"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -448,7 +457,7 @@ msgstr "Gestion Budgétaire"
 #. module: account_budget
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_budget/i18n/pt.po b/addons/account_budget/i18n/pt.po
index 4b54eb2fab2..ca092fcf64c 100644
--- a/addons/account_budget/i18n/pt.po
+++ b/addons/account_budget/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-08-02 21:07+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 05:16+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_budget/wizard/account_budget_analytic.py b/addons/account_budget/wizard/account_budget_analytic.py
index ef970c92904..b2a33434016 100644
--- a/addons/account_budget/wizard/account_budget_analytic.py
+++ b/addons/account_budget/wizard/account_budget_analytic.py
@@ -39,7 +39,7 @@ class account_budget_analytic(osv.osv_memory):
         datas = {}
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids)[0]
+        data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': context.get('active_ids',[]),
              'model': 'account.analytic.account',
diff --git a/addons/account_budget/wizard/account_budget_crossovered_report.py b/addons/account_budget/wizard/account_budget_crossovered_report.py
index 99c6989e845..5667a264d2a 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_report.py
@@ -39,7 +39,7 @@ class account_budget_crossvered_report(osv.osv_memory):
         datas = {}
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids)[0]
+        data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': context.get('active_ids',[]),
              'model': 'crossovered.budget',
diff --git a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
index ad0237af051..c2e34b2f2da 100644
--- a/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
+++ b/addons/account_budget/wizard/account_budget_crossovered_summary_report.py
@@ -41,7 +41,7 @@ class account_budget_crossvered_summary_report(osv.osv_memory):
         datas = {}
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids)[0]
+        data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': context.get('active_ids',[]),
              'model': 'crossovered.budge',
diff --git a/addons/account_budget/wizard/account_budget_report.py b/addons/account_budget/wizard/account_budget_report.py
index 67359cf45f1..a85ff42fe4d 100644
--- a/addons/account_budget/wizard/account_budget_report.py
+++ b/addons/account_budget/wizard/account_budget_report.py
@@ -40,7 +40,7 @@ class account_budget_report(osv.osv_memory):
         datas = {}
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids)[0]
+        data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': context.get('active_ids',[]),
              'model': 'account.budget.post',
diff --git a/addons/account_cancel/i18n/account_cancel.pot b/addons/account_cancel/i18n/account_cancel.pot
index 5108a621e1f..d6c036e31f1 100644
--- a/addons/account_cancel/i18n/account_cancel.pot
+++ b/addons/account_cancel/i18n/account_cancel.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:52+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:52+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_chart/i18n/account_chart.pot b/addons/account_chart/i18n/account_chart.pot
index 14066c7105c..0bf5b9ad036 100644
--- a/addons/account_chart/i18n/account_chart.pot
+++ b/addons/account_chart/i18n/account_chart.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:53+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:53+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:38+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py
index 0bb7228d821..e2cde58fd5c 100644
--- a/addons/account_coda/account_coda.py
+++ b/addons/account_coda/account_coda.py
@@ -43,6 +43,8 @@ class account_coda(osv.osv):
     }
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None: 
+            context = {}
         res = super(account_coda, self).search(cr, user, args=args, offset=offset, limit=limit, order=order,
                 context=context, count=count)
         if context.get('bank_statement', False) and not res:
diff --git a/addons/account_coda/i18n/account_coda.pot b/addons/account_coda/i18n/account_coda.pot
index c0a1036a337..2c8a3d548e0 100644
--- a/addons/account_coda/i18n/account_coda.pot
+++ b/addons/account_coda/i18n/account_coda.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:53+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:53+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:39+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py
index a52528e2fa5..6d3743116db 100644
--- a/addons/account_coda/wizard/account_coda_import.py
+++ b/addons/account_coda/wizard/account_coda_import.py
@@ -66,13 +66,13 @@ class account_coda_import(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         line_obj = self.pool.get('account.move.line')
 
-        if not context:
+        if context is None:
             context = {}
 
         data = self.read(cr, uid, ids)[0]
 
         codafile = data['coda']
-        journal_code = journal_obj.browse(cr, uid, data['journal_id'], context).code
+        journal_code = journal_obj.browse(cr, uid, data['journal_id'], context=context).code
 
         period = account_period_obj.find(cr, uid, context=context)[0]
         def_pay_acc = data['def_payable']
@@ -155,7 +155,7 @@ class account_coda_import(osv.osv_memory):
                     bank_ids = partner_bank_obj.search(cr, uid, [('acc_number', '=', st_line_partner_acc)])
                     bank_statement_lines[st_line_name].update({'cntry_number': cntry_number, 'contry_name': contry_name})
                     if bank_ids:
-                        bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context)
+                        bank = partner_bank_obj.browse(cr, uid, bank_ids[0], context=context)
                         if line and bank.partner_id:
                             bank_statement_lines[st_line_name].update({'partner_id': bank.partner_id.id})
                             if bank_statement_lines[st_line_name]['amount'] < 0:
@@ -321,7 +321,7 @@ class account_coda_import(osv.osv_memory):
         }
 
     def action_open_window(self, cr, uid, data, context=None):
-        if not context:
+        if context is None:
             context = {}
 
         return {
diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot
index 9ff84d9c9c7..e30aaca5f2f 100644
--- a/addons/account_followup/i18n/account_followup.pot
+++ b/addons/account_followup/i18n/account_followup.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:54+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:54+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/account_followup/i18n/el.po b/addons/account_followup/i18n/el.po
index 98b78ff45e3..10803764999 100644
--- a/addons/account_followup/i18n/el.po
+++ b/addons/account_followup/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-14 16:28+0000\n"
+"PO-Revision-Date: 2010-12-16 01:30+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po
index 3385c0991bc..a1eb5088d5c 100644
--- a/addons/account_followup/i18n/pt.po
+++ b/addons/account_followup/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-08-02 21:37+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-16 00:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py
index 8bfb3fff1a9..30cbe058fd4 100644
--- a/addons/account_followup/report/account_followup_print.py
+++ b/addons/account_followup/report/account_followup_print.py
@@ -58,7 +58,7 @@ class report_rappel(report_sxw.rml_parse):
         movelines = moveline_obj.read(self.cr, self.uid, movelines)
         return movelines
 
-    def _get_text(self, partner, followup_id, context={}):
+    def _get_text(self, partner, followup_id, context=None):
         fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup')
         fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line
         li_delay = []
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index 174061438f8..7d296f74f76 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -39,7 +39,7 @@ class account_followup_print(osv.osv_memory):
             context = {}
         if context.get('active_model', 'ir.ui.menu') == 'account_followup.followup':
             return context.get('active_id', False)
-        company_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         followp_id = self.pool.get('account_followup.followup').search(cr, uid, [('company_id', '=', company_id)], context=context)
         return followp_id and followp_id[0] or False
 
@@ -48,7 +48,7 @@ class account_followup_print(osv.osv_memory):
 
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [])[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         context.update({'followup_id': data['followup_id'], 'date':data['date']})
@@ -146,7 +146,7 @@ class account_followup_print_all(osv.osv_memory):
         if context is None:
             context = {}
         if ids:
-            data = self.read(cr, uid, ids, [])[0]
+            data = self.read(cr, uid, ids, [], context=context)[0]
         cr.execute(
             "SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\
             "FROM account_move_line AS l "\
@@ -208,14 +208,14 @@ class account_followup_print_all(osv.osv_memory):
 
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [])[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
         if data['email_conf']:
             msg_sent = ''
             msg_unsent = ''
-            data_user = user_obj.browse(cr, uid, uid)
-            move_lines = line_obj.browse(cr, uid, data['partner_ids'])
+            data_user = user_obj.browse(cr, uid, uid, context=context)
+            move_lines = line_obj.browse(cr, uid, data['partner_ids'], context=context)
             partners = []
             dict_lines = {}
             for line in move_lines:
@@ -223,7 +223,7 @@ class account_followup_print_all(osv.osv_memory):
                 dict_lines[line.name.id] =line
             for partner in partners:
                 ids_lines = move_obj.search(cr,uid,[('partner_id','=',partner.id),('reconcile_id','=',False),('account_id.type','in',['receivable'])])
-                data_lines = move_obj.browse(cr, uid, ids_lines)
+                data_lines = move_obj.browse(cr, uid, ids_lines, context=context)
                 followup_data = dict_lines[partner.id]
                 dest = False
                 if partner.address:
@@ -306,7 +306,7 @@ class account_followup_print_all(osv.osv_memory):
     def do_print(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [])[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         res = self._get_partners_followp(cr, uid, ids, context)['to_update']
         to_update = res
         data['followup_id'] = 'followup_id' in context and context['followup_id'] or False
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 2c2a02d4b9d..3337710420f 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -127,13 +127,12 @@ class account_invoice_line(osv.osv):
     def copy_data(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
-        default['state'] = self.browse(cr, uid, id).state
+        default['state'] = self.browse(cr, uid, id, context=context).state
         return super(account_invoice_line, self).copy_data(cr, uid, id, default, context)
 
     def _fnct(self, cr, uid, ids, name, args, context=None):
         res = {}
-
-        lines = self.browse(cr, uid, ids)
+        lines = self.browse(cr, uid, ids, context=context)
         account_ids = [line.account_id.id for line in lines]
         account_names = dict(self.pool.get('account.account').name_get(cr, uid, account_ids, context=context))
         for line in lines:
@@ -180,7 +179,7 @@ account_invoice_line()
 class one2many_mod2(fields.one2many):
 
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
+        if context is None:
             context = {}
         if not values:
             values = {}
diff --git a/addons/account_invoice_layout/i18n/account_invoice_layout.pot b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
index 2376750201e..ad33fb6a6fa 100644
--- a/addons/account_invoice_layout/i18n/account_invoice_layout.pot
+++ b/addons/account_invoice_layout/i18n/account_invoice_layout.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:14:50+0000\n"
-"PO-Revision-Date: 2010-12-10 17:14:50+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:40+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:40+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,12 +32,6 @@ msgstr ""
 msgid "Cancelled Invoice"
 msgstr ""
 
-#. module: account_invoice_layout
-#: report:account.invoice.layout:0
-#: report:notify_account.invoice:0
-msgid "PRO-FORMA"
-msgstr ""
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 #: field:notify.message,name:0
@@ -56,11 +50,6 @@ msgstr ""
 msgid "Disc. (%)"
 msgstr ""
 
-#. module: account_invoice_layout
-#: view:account.invoice.special.msg:0
-msgid "Print"
-msgstr ""
-
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
 msgid "Note"
@@ -100,8 +89,9 @@ msgid "Document"
 msgstr ""
 
 #. module: account_invoice_layout
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
 msgstr ""
 
 #. module: account_invoice_layout
@@ -281,8 +271,8 @@ msgid "Supplier Invoice"
 msgstr ""
 
 #. module: account_invoice_layout
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
+#: view:account.invoice.special.msg:0
+msgid "Print"
 msgstr ""
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/sl.po b/addons/account_invoice_layout/i18n/sl.po
index b098e46f46f..9d88989084b 100644
--- a/addons/account_invoice_layout/i18n/sl.po
+++ b/addons/account_invoice_layout/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-10-30 14:06+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-15 07:49+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:22+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -25,7 +25,7 @@ msgstr "Vmesna vsota"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr ""
+msgstr "Zaznamek:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -93,7 +93,7 @@ msgstr ""
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "DDV:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -141,7 +141,7 @@ msgstr "Cena"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Datum računa"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -179,7 +179,7 @@ msgstr "Posebno sporočilo"
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
 msgid "Message to Print at the bottom of report"
-msgstr ""
+msgstr "Sporočilo, ki se izpiše na dnu poročila"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -191,7 +191,7 @@ msgstr "Količina"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Sklic partnerja"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -204,7 +204,7 @@ msgstr "Račun"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Skupaj:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -237,7 +237,7 @@ msgstr "Znesek"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel.:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -296,13 +296,13 @@ msgstr "Davek"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Postavka računa"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Skupaj (brez davkov):"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -313,7 +313,7 @@ msgstr "Izpiši obvestilo ali želeno sporočilo"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Faks:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
diff --git a/addons/account_invoice_layout/i18n/sv.po b/addons/account_invoice_layout/i18n/sv.po
index cf7a8130188..47e6e9f38cc 100644
--- a/addons/account_invoice_layout/i18n/sv.po
+++ b/addons/account_invoice_layout/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.py b/addons/account_invoice_layout/wizard/account_invoice_special_message.py
index adc3261fa64..a0bd6b328c3 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.py
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.py
@@ -34,7 +34,7 @@ class account_invoice_special_msg(osv.osv_memory):
         if context is None:
             context = {}
 
-        data = self.read(cr, uid, ids, [])[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         datas = {
              'ids': context.get('active_ids',[]),
              'model': 'account.invoice',
diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py
index 638b75dcaaa..68bb33ca4e5 100644
--- a/addons/account_payment/account_move_line.py
+++ b/addons/account_payment/account_move_line.py
@@ -26,7 +26,7 @@ from tools.translate import _
 class account_move_line(osv.osv):
     _inherit = "account.move.line"
 
-    def amount_to_pay(self, cr, uid, ids, name, arg={}, context={}):
+    def amount_to_pay(self, cr, uid, ids, name, arg={}, context=None):
         """ Return the amount still to pay regarding all the payemnt orders
         (excepting cancelled orders)"""
         if not ids:
@@ -47,7 +47,7 @@ class account_move_line(osv.osv):
         r = dict(cr.fetchall())
         return r
 
-    def _to_pay_search(self, cr, uid, obj, name, args, context):
+    def _to_pay_search(self, cr, uid, obj, name, args, context=None):
         if not args:
             return []
         line_obj = self.pool.get('account.move.line')
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index 63d78812946..d5858d94f80 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -39,7 +39,7 @@ class payment_mode(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
     }
 
-    def suitable_bank_types(self, cr, uid, payment_code=None, context={}):
+    def suitable_bank_types(self, cr, uid, payment_code=None, context=None):
         """Return the codes of the bank type that are suitable
         for the given payment type code"""
         if not payment_code:
@@ -267,10 +267,10 @@ class payment_line(osv.osv):
                     line.amount_currency, context=ctx)
         return res
 
-    def _get_currency(self, cr, uid, context):
+    def _get_currency(self, cr, uid, context=None):
         user_obj = self.pool.get('res.users')
         currency_obj = self.pool.get('res.currency')
-        user = user_obj.browse(cr, uid, uid)
+        user = user_obj.browse(cr, uid, uid, context=context)
 
         if user.company_id:
             return user.company_id.currency_id.id
@@ -284,7 +284,7 @@ class payment_line(osv.osv):
         date = False
 
         if context.get('order_id') and context['order_id']:
-            order = payment_order_obj.browse(cr, uid, context['order_id'], context)
+            order = payment_order_obj.browse(cr, uid, context['order_id'], context=context)
             if order.date_prefered == 'fixed':
                 date = order.date_scheduled
             else:
@@ -364,7 +364,7 @@ class payment_line(osv.osv):
         data['amount_currency'] = data['communication'] = data['partner_id'] = data['reference'] = data['date_created'] = data['bank_id'] = data['amount'] = False
 
         if move_line_id:
-            line = move_line_obj.browse(cr, uid, move_line_id)
+            line = move_line_obj.browse(cr, uid, move_line_id, context=context)
             data['amount_currency'] = line.amount_to_pay
 
             res = self.onchange_amount(cr, uid, ids, data['amount_currency'], currency,
@@ -413,7 +413,7 @@ class payment_line(osv.osv):
         data['info_partner'] = data['bank_id'] = False
 
         if partner_id:
-            part_obj = partner_obj.browse(cr, uid, partner_id)
+            part_obj = partner_obj.browse(cr, uid, partner_id, context=context)
             partner = part_obj.name or ''
 
             if part_obj.address:
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index ab891eb3221..e6fea3a69df 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:14:51+0000\n"
-"PO-Revision-Date: 2010-12-10 17:14:51+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -151,8 +151,8 @@ msgid "Reference"
 msgstr ""
 
 #. module: account_payment
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
 msgstr ""
 
 #. module: account_payment
@@ -166,11 +166,6 @@ msgstr ""
 msgid "Directly"
 msgstr ""
 
-#. module: account_payment
-#: sql_constraint:payment.line:0
-msgid "The payment line name must be unique!"
-msgstr ""
-
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_payment_line_form
 #: model:ir.model,name:account_payment.model_payment_line
@@ -384,11 +379,6 @@ msgstr ""
 msgid "Draft"
 msgstr ""
 
-#. module: account_payment
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
-
 #. module: account_payment
 #: help:payment.line,communication2:0
 msgid "The successor message of Communication."
diff --git a/addons/account_payment/wizard/account_payment_order.py b/addons/account_payment/wizard/account_payment_order.py
index 662ed495d31..b8328aee333 100644
--- a/addons/account_payment/wizard/account_payment_order.py
+++ b/addons/account_payment/wizard/account_payment_order.py
@@ -62,7 +62,7 @@ class payment_order_create(osv.osv_memory):
         payment_obj = self.pool.get('payment.line')
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [])[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         line_ids = data['entries']
         if not line_ids:
             return {}
diff --git a/addons/account_payment/wizard/account_payment_pay.py b/addons/account_payment/wizard/account_payment_pay.py
index 8e524c78959..6627ffaa614 100644
--- a/addons/account_payment/wizard/account_payment_pay.py
+++ b/addons/account_payment/wizard/account_payment_pay.py
@@ -31,6 +31,8 @@ class account_payment_make_payment(osv.osv_memory):
         If type is manual. just confirm the order.
         """
         obj_payment_order = self.pool.get('payment.order')
+        if context is None:
+            context = {}
 #        obj_model = self.pool.get('ir.model.data')
 #        obj_act = self.pool.get('ir.actions.act_window')
 #        order = obj_payment_order.browse(cr, uid, context['active_id'], context)
diff --git a/addons/account_payment/wizard/account_payment_populate_statement.py b/addons/account_payment/wizard/account_payment_populate_statement.py
index bd61d58be3f..cac06bb472a 100644
--- a/addons/account_payment/wizard/account_payment_populate_statement.py
+++ b/addons/account_payment/wizard/account_payment_populate_statement.py
@@ -60,7 +60,7 @@ class account_payment_populate_statement(osv.osv_memory):
 
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [])[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         line_ids = data['lines']
         if not line_ids:
             return {}
diff --git a/addons/account_sequence/account_sequence.py b/addons/account_sequence/account_sequence.py
index 56accc5f6eb..1649a8890fa 100644
--- a/addons/account_sequence/account_sequence.py
+++ b/addons/account_sequence/account_sequence.py
@@ -33,7 +33,7 @@ class account_move(osv.osv):
         obj_sequence = self.pool.get('ir.sequence')
         res = super(account_move, self).post(cr, uid, ids, context=context)
         seq_no = False
-        for move in self.browse(cr, uid, ids, context):
+        for move in self.browse(cr, uid, ids, context=context):
             if move.journal_id.internal_sequence_id:
                 seq_no = obj_sequence.get_id(cr, uid, move.journal_id.internal_sequence_id.id, context=context)
             if seq_no:
diff --git a/addons/account_sequence/account_sequence_installer.py b/addons/account_sequence/account_sequence_installer.py
index f7bcb113388..d27d0aa9f32 100644
--- a/addons/account_sequence/account_sequence_installer.py
+++ b/addons/account_sequence/account_sequence_installer.py
@@ -47,7 +47,7 @@ class account_sequence_installer(osv.osv_memory):
             context = {}
         jou_obj = self.pool.get('account.journal')
         obj_sequence = self.pool.get('ir.sequence')
-        record = self.browse(cr, uid, ids, context)[0]
+        record = self.browse(cr, uid, ids, context=context)[0]
         j_ids = []
         if record.company_id:
             company_id = record.company_id.id,
@@ -70,7 +70,7 @@ class account_sequence_installer(osv.osv_memory):
         ir_seq = obj_sequence.create(cr, uid, vals, context)
         res =  super(account_sequence_installer, self).execute(cr, uid, ids, context=context)
         journal_ids = jou_obj.search(cr, uid, search_criteria, context=context)
-        for journal in jou_obj.browse(cr, uid, journal_ids, context):
+        for journal in jou_obj.browse(cr, uid, journal_ids, context=context):
             if not journal.internal_sequence_id:
                 j_ids.append(journal.id)
         if j_ids:
diff --git a/addons/account_sequence/i18n/account_sequence.pot b/addons/account_sequence/i18n/account_sequence.pot
index a8a4af9741d..42f81e83cbc 100644
--- a/addons/account_sequence/i18n/account_sequence.pot
+++ b/addons/account_sequence/i18n/account_sequence.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:55+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:55+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:41+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,6 +16,7 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: account_sequence
+#: view:account.sequence.installer:0
 #: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
 msgid "Account Sequence Application Configuration"
 msgstr ""
@@ -57,8 +58,13 @@ msgid "The next number of the sequence will be incremented by this number"
 msgstr ""
 
 #. module: account_sequence
-#: field:account.sequence.installer,progress:0
-msgid "Configuration Progress"
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: account_sequence
@@ -132,6 +138,11 @@ msgstr ""
 msgid "account.sequence.installer"
 msgstr ""
 
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
 #. module: account_sequence
 #: help:account.sequence.installer,prefix:0
 msgid "Prefix value of the record for the sequence"
@@ -182,6 +193,11 @@ msgstr ""
 msgid "Journal"
 msgstr ""
 
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
 #. module: account_sequence
 #: constraint:account.move.line:0
 msgid "You can not create move line on view account."
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 03ac3b87ba0..9dc496c5ec6 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -30,7 +30,7 @@ from tools.translate import _
 class account_move_line(osv.osv):
     _inherit = 'account.move.line'
 
-    def _unreconciled(self, cr, uid, ids, prop, unknow_none, context):
+    def _unreconciled(self, cr, uid, ids, prop, unknow_none, context=None):
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.debit - line.credit
@@ -49,16 +49,19 @@ account_move_line()
 
 class account_voucher(osv.osv):
 
-    def _get_type(self, cr, uid, ids, context={}):
+    def _get_type(self, cr, uid, ids, context=None):
+        if context is None: context = {}
         return context.get('type', False)
 
-    def _get_period(self, cr, uid, context={}):
+    def _get_period(self, cr, uid, context=None):
+        if context is None: context = {}
         if context.get('period_id', False):
             return context.get('period_id')
         periods = self.pool.get('account.period').find(cr, uid)
         return periods and periods[0] or False
 
-    def _get_journal(self, cr, uid, context={}):
+    def _get_journal(self, cr, uid, context=None):
+        if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
         if context.get('journal_id', False):
             return context.get('journal_id')
@@ -71,7 +74,8 @@ class account_voucher(osv.osv):
         res = journal_pool.search(cr, uid, [('type', '=', ttype)], limit=1)
         return res and res[0] or False
 
-    def _get_tax(self, cr, uid, context={}):
+    def _get_tax(self, cr, uid, context=None):
+        if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
         journal_id = context.get('journal_id', False)
         if not journal_id:
@@ -83,39 +87,45 @@ class account_voucher(osv.osv):
 
         if not journal_id:
             return False
-        journal = journal_pool.browse(cr, uid, journal_id)
+        journal = journal_pool.browse(cr, uid, journal_id, context=context)
         account_id = journal.default_credit_account_id or journal.default_debit_account_id
         if account_id and account_id.tax_ids:
             tax_id = account_id.tax_ids[0].id
             return tax_id
         return False
 
-    def _get_currency(self, cr, uid, context):
+    def _get_currency(self, cr, uid, context=None):
+        if context is None: context = {}
         journal_pool = self.pool.get('account.journal')
         journal_id = context.get('journal_id', False)
         if journal_id:
-            journal = journal_pool.browse(cr, uid, journal_id)
+            journal = journal_pool.browse(cr, uid, journal_id, context=context)
 #            currency_id = journal.company_id.currency_id.id
             if journal.currency:
                 return journal.currency.id
         return False
 
-    def _get_partner(self, cr, uid, context={}):
+    def _get_partner(self, cr, uid, context=None):
+        if context is None: context = {}
         return context.get('partner_id', False)
 
-    def _get_reference(self, cr, uid, context={}):
+    def _get_reference(self, cr, uid, context=None):
+        if context is None: context = {}
         return context.get('reference', False)
 
-    def _get_narration(self, cr, uid, context={}):
+    def _get_narration(self, cr, uid, context=None):
+        if context is None: context = {}
         return context.get('narration', False)
 
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
+        if context is None: context = {}
         return [(r['id'], (str("%.2f" % r['amount']) or '')) for r in self.read(cr, uid, ids, ['amount'], context, load='_classic_write')]
 
     def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False):
         mod_obj = self.pool.get('ir.model.data')
+        if context is None: context = {}
         if not view_id and context.get('invoice_type', False):
             if context.get('invoice_type', False) in ('out_invoice', 'out_refund'):
                 result = mod_obj.get_object_reference(cr, uid, 'account_voucher', 'view_vendor_receipt_form')
@@ -232,14 +242,15 @@ class account_voucher(osv.osv):
         'comment': 'Write-Off',
     }
 
-    def compute_tax(self, cr, uid, ids, context={}):
+    def compute_tax(self, cr, uid, ids, context=None):
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
         position_pool = self.pool.get('account.fiscal.position')
         voucher_line_pool = self.pool.get('account.voucher.line')
         voucher_pool = self.pool.get('account.voucher')
+        if context is None: context = {}
 
-        for voucher in voucher_pool.browse(cr, uid, ids, context):
+        for voucher in voucher_pool.browse(cr, uid, ids, context=context):
             voucher_amount = 0.0
             for line in voucher.line_ids:
                 voucher_amount += line.untax_amount or line.amount
@@ -250,10 +261,10 @@ class account_voucher(osv.osv):
                 self.write(cr, uid, [voucher.id], {'amount':voucher_amount, 'tax_amount':0.0})
                 continue
 
-            tax = [tax_pool.browse(cr, uid, voucher.tax_id.id)]
-            partner = partner_pool.browse(cr, uid, voucher.partner_id.id) or False
+            tax = [tax_pool.browse(cr, uid, voucher.tax_id.id, context=context)]
+            partner = partner_pool.browse(cr, uid, voucher.partner_id.id, context=context) or False
             taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
-            tax = tax_pool.browse(cr, uid, taxes)
+            tax = tax_pool.browse(cr, uid, taxes, context=context)
 
             total = voucher_amount
             total_tax = 0.0
@@ -277,7 +288,7 @@ class account_voucher(osv.osv):
             self.write(cr, uid, [voucher.id], {'amount':total, 'tax_amount':total_tax})
         return True
 
-    def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context={}):
+    def onchange_price(self, cr, uid, ids, line_ids, tax_id, partner_id=False, context=None):
         tax_pool = self.pool.get('account.tax')
         partner_pool = self.pool.get('res.partner')
         position_pool = self.pool.get('account.fiscal.position')
@@ -299,11 +310,11 @@ class account_voucher(osv.osv):
         total = voucher_total
         total_tax = 0.0
         if tax_id:
-            tax = [tax_pool.browse(cr, uid, tax_id)]
+            tax = [tax_pool.browse(cr, uid, tax_id, context=context)]
             if partner_id:
-                partner = partner_pool.browse(cr, uid, partner_id) or False
+                partner = partner_pool.browse(cr, uid, partner_id, context=context) or False
                 taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, tax)
-                tax = tax_pool.browse(cr, uid, taxes)
+                tax = tax_pool.browse(cr, uid, taxes, context=context)
 
             if not tax[0].price_include:
                 for tax_line in tax_pool.compute_all(cr, uid, tax, voucher_total, 1).get('taxes', []):
@@ -332,7 +343,7 @@ class account_voucher(osv.osv):
             })
         return {'value':default}
 
-    def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context={}):
+    def onchange_journal_voucher(self, cr, uid, ids, line_ids=False, tax_id=False, price=0.0, partner_id=False, journal_id=False, ttype=False, context=None):
         """price
         Returns a dict that contains new values and context
 
@@ -352,8 +363,8 @@ class account_voucher(osv.osv):
         partner_pool = self.pool.get('res.partner')
         journal_pool = self.pool.get('account.journal')
 
-        journal = journal_pool.browse(cr, uid, journal_id)
-        partner = partner_pool.browse(cr, uid, partner_id)
+        journal = journal_pool.browse(cr, uid, journal_id, context=context)
+        partner = partner_pool.browse(cr, uid, partner_id, context=context)
         account_id = False
         tr_type = False
         if journal.type in ('sale','sale_refund'):
@@ -411,8 +422,8 @@ class account_voucher(osv.osv):
                 line_pool.unlink(cr, uid, line_ids)
             return default
 
-        journal = journal_pool.browse(cr, uid, journal_id)
-        partner = partner_pool.browse(cr, uid, partner_id)
+        journal = journal_pool.browse(cr, uid, journal_id, context=context)
+        partner = partner_pool.browse(cr, uid, partner_id, context=context)
         account_id = False
         if journal.type in ('sale','sale_refund'):
             account_id = partner.property_account_receivable.id
@@ -441,7 +452,7 @@ class account_voucher(osv.osv):
         else:
             ids = context['move_line_ids']
         ids.reverse()
-        moves = move_line_pool.browse(cr, uid, ids)
+        moves = move_line_pool.browse(cr, uid, ids, context=context)
 
         company_currency = journal.company_id.currency_id.id
         if company_currency != currency_id and ttype == 'payment':
@@ -496,7 +507,7 @@ class account_voucher(osv.osv):
 
         return default
 
-    def onchange_date(self, cr, user, ids, date, context={}):
+    def onchange_date(self, cr, user, ids, date, context=None):
         """
         @param date: latest value from user input for field date
         @param args: other arguments
@@ -513,11 +524,11 @@ class account_voucher(osv.osv):
             }
         }
 
-    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context={}):
+    def onchange_journal(self, cr, uid, ids, journal_id, line_ids, tax_id, partner_id, context=None):
         if not journal_id:
             return False
         journal_pool = self.pool.get('account.journal')
-        journal = journal_pool.browse(cr, uid, journal_id)
+        journal = journal_pool.browse(cr, uid, journal_id, context=context)
         account_id = journal.default_credit_account_id or journal.default_debit_account_id
         tax_id = False
         if account_id and account_id.tax_ids:
@@ -535,18 +546,18 @@ class account_voucher(osv.osv):
         self.action_move_line_create(cr, uid, ids, context=context)
         return True
 
-    def action_cancel_draft(self, cr, uid, ids, context={}):
+    def action_cancel_draft(self, cr, uid, ids, context=None):
         wf_service = netsvc.LocalService("workflow")
         for voucher_id in ids:
             wf_service.trg_create(uid, 'account.voucher', voucher_id, cr)
         self.write(cr, uid, ids, {'state':'draft'})
         return True
 
-    def cancel_voucher(self, cr, uid, ids, context={}):
+    def cancel_voucher(self, cr, uid, ids, context=None):
         reconcile_pool = self.pool.get('account.move.reconcile')
         move_pool = self.pool.get('account.move')
 
-        for voucher in self.browse(cr, uid, ids):
+        for voucher in self.browse(cr, uid, ids, context=context):
             recs = []
             for line in voucher.move_ids:
                 if line.reconcile_id:
@@ -600,14 +611,14 @@ class account_voucher(osv.osv):
                 terms = term_pool.compute(cr, uid, term_id, amount)
                 return terms
             return False
-        if not context:
+        if context is None:
             context = {}
         move_pool = self.pool.get('account.move')
         move_line_pool = self.pool.get('account.move.line')
         currency_pool = self.pool.get('res.currency')
         tax_obj = self.pool.get('account.tax')
         seq_obj = self.pool.get('ir.sequence')
-        for inv in self.browse(cr, uid, ids):
+        for inv in self.browse(cr, uid, ids, context=context):
             if inv.move_id:
                 continue
             if inv.number:
@@ -787,7 +798,7 @@ class account_voucher_line(osv.osv):
     def _compute_balance(self, cr, uid, ids, name, args, context=None):
         currency_pool = self.pool.get('res.currency')
         rs_data = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res = {}
             company_currency = line.voucher_id.journal_id.company_id.currency_id.id
             voucher_currency = line.voucher_id.currency_id.id
@@ -827,7 +838,7 @@ class account_voucher_line(osv.osv):
         'name': ''
     }
 
-    def onchange_move_line_id(self, cr, user, ids, move_line_id, context={}):
+    def onchange_move_line_id(self, cr, user, ids, move_line_id, context=None):
         """
         Returns a dict that contains new values and context
 
@@ -862,6 +873,8 @@ class account_voucher_line(osv.osv):
 
         @return: Returns a dict that contains default values for fields
         """
+        if context is None: 
+            context = {}
         journal_id = context.get('journal_id', False)
         partner_id = context.get('partner_id', False)
         journal_pool = self.pool.get('account.journal')
@@ -869,7 +882,7 @@ class account_voucher_line(osv.osv):
         values = super(account_voucher_line, self).default_get(cr, user, fields_list, context=context)
         if (not journal_id) or ('account_id' not in fields_list):
             return values
-        journal = journal_pool.browse(cr, user, journal_id)
+        journal = journal_pool.browse(cr, user, journal_id, context=context)
         account_id = False
         ttype = 'cr'
         if journal.type in ('sale', 'sale_refund'):
@@ -898,7 +911,7 @@ class account_bank_statement(osv.osv):
 
     def button_cancel(self, cr, uid, ids, context=None):
         voucher_obj = self.pool.get('account.voucher')
-        for st in self.browse(cr, uid, ids, context):
+        for st in self.browse(cr, uid, ids, context=context):
             voucher_ids = []
             for line in st.line_ids:
                 if line.voucher_id:
@@ -958,7 +971,7 @@ class account_bank_statement_line(osv.osv):
 
     def unlink(self, cr, uid, ids, context=None):
         voucher_obj = self.pool.get('account.voucher')
-        statement_line = self.browse(cr, uid, ids, context)
+        statement_line = self.browse(cr, uid, ids, context=context)
         unlink_ids = []
         for st_line in statement_line:
             if st_line.voucher_id:
diff --git a/addons/account_voucher/i18n/account_voucher.pot b/addons/account_voucher/i18n/account_voucher.pot
index a6459aa6c6b..19e18ce07c4 100644
--- a/addons/account_voucher/i18n/account_voucher.pot
+++ b/addons/account_voucher/i18n/account_voucher.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:14:52+0000\n"
-"PO-Revision-Date: 2010-12-10 17:14:52+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -248,11 +248,6 @@ msgstr ""
 msgid "Unreconcile"
 msgstr ""
 
-#. module: account_voucher
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
 msgid "Tax"
@@ -340,11 +335,6 @@ msgstr ""
 msgid "Date:"
 msgstr ""
 
-#. module: account_voucher
-#: selection:account.voucher,pay_now:0
-msgid "Pay Directly"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher,period_id:0
@@ -380,8 +370,8 @@ msgid "Supplier Voucher"
 msgstr ""
 
 #. module: account_voucher
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
+#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
+msgid "Vouchers Entries"
 msgstr ""
 
 #. module: account_voucher
@@ -448,8 +438,8 @@ msgid "Paid Amount"
 msgstr ""
 
 #. module: account_voucher
-#: view:account.voucher:0
-msgid "Expense Lines"
+#: selection:account.voucher,pay_now:0
+msgid "Pay Directly"
 msgstr ""
 
 #. module: account_voucher
@@ -560,9 +550,8 @@ msgid "Extended Filters..."
 msgstr ""
 
 #. module: account_voucher
-#: report:voucher.cash_receipt.drcr:0
-#: report:voucher.print:0
-msgid "Number:"
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
 msgstr ""
 
 #. module: account_voucher
@@ -571,8 +560,8 @@ msgid "Amount reconciled"
 msgstr ""
 
 #. module: account_voucher
-#: field:account.voucher,comment:0
-msgid "Comment"
+#: view:account.voucher:0
+msgid "Expense Lines"
 msgstr ""
 
 #. module: account_voucher
@@ -580,6 +569,11 @@ msgstr ""
 msgid "Previous Payments ?"
 msgstr ""
 
+#. module: account_voucher
+#: field:account.voucher,comment:0
+msgid "Comment"
+msgstr ""
+
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher
@@ -630,8 +624,9 @@ msgid "Bill Date"
 msgstr ""
 
 #. module: account_voucher
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
+#: report:voucher.cash_receipt.drcr:0
+#: report:voucher.print:0
+msgid "Number:"
 msgstr ""
 
 #. module: account_voucher
@@ -855,11 +850,6 @@ msgstr ""
 msgid "Untax Amount"
 msgstr ""
 
-#. module: account_voucher
-#: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
-msgid "Vouchers Entries"
-msgstr ""
-
 #. module: account_voucher
 #: view:account.voucher:0
 #: field:account.voucher.line,amount_unreconciled:0
diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po
index b48b91de35c..d04c9ee49c1 100644
--- a/addons/account_voucher/i18n/de.po
+++ b/addons/account_voucher/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-15 01:41+0000\n"
+"PO-Revision-Date: 2010-12-15 21:40+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/i18n/sv.po b/addons/account_voucher/i18n/sv.po
index c06f8c3dfc2..094310470ff 100644
--- a/addons/account_voucher/i18n/sv.po
+++ b/addons/account_voucher/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-12-14 17:11+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2010-12-15 21:34+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -84,7 +84,7 @@ msgstr "Fakturabetalning"
 #. module: account_voucher
 #: field:account.voucher.line,amount_original:0
 msgid "Originial Amount"
-msgstr ""
+msgstr "Ursprungligt belopp"
 
 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
@@ -179,7 +179,7 @@ msgstr "Du kan inte skapa transaktioner för ett avslutat konto."
 #. module: account_voucher
 #: field:account.voucher,narration:0
 msgid "Notes"
-msgstr ""
+msgstr "Anteckningar"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt
diff --git a/addons/account_voucher/i18n/vi.po b/addons/account_voucher/i18n/vi.po
index 43f2141fff1..27306f6a1d8 100644
--- a/addons/account_voucher/i18n/vi.po
+++ b/addons/account_voucher/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-08-02 14:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 15:25+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
@@ -41,7 +41,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:0
@@ -576,7 +576,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Bộ lọc mở rộng..."
 
 #. module: account_voucher
 #: report:voucher.cash_receipt.drcr:0
diff --git a/addons/account_voucher/wizard/account_statement_from_invoice.py b/addons/account_voucher/wizard/account_statement_from_invoice.py
index 9b6400b15a9..fa1a66e0135 100644
--- a/addons/account_voucher/wizard/account_statement_from_invoice.py
+++ b/addons/account_voucher/wizard/account_statement_from_invoice.py
@@ -35,7 +35,8 @@ class account_statement_from_invoice_lines(osv.osv_memory):
     }
 
     def populate_statement(self, cr, uid, ids, context=None):
-
+        if context is None: 
+            context = {}
         statement_id = context.get('statement_id', False)
         if not statement_id:
             return {}
@@ -134,7 +135,8 @@ class account_statement_from_invoice(osv.osv_memory):
     }
 
     def search_invoices(self, cr, uid, ids, context=None):
-
+        if context is None: 
+            context = {}
         line_obj = self.pool.get('account.move.line')
         statement_obj = self.pool.get('account.bank.statement')
         journal_obj = self.pool.get('account.journal')
diff --git a/addons/account_voucher/wizard/account_voucher_unreconcile.py b/addons/account_voucher/wizard/account_voucher_unreconcile.py
index 69aa6e1181d..2bfdfd1ecf8 100644
--- a/addons/account_voucher/wizard/account_voucher_unreconcile.py
+++ b/addons/account_voucher/wizard/account_voucher_unreconcile.py
@@ -41,7 +41,7 @@ class account_voucher_unreconcile(osv.osv_memory):
         voucher_pool = self.pool.get('account.voucher')
         reconcile_pool = self.pool.get('account.move.reconcile')
         if context.get('active_id'):
-            voucher = voucher_pool.browse(cr, uid, context.get('active_id'), context)
+            voucher = voucher_pool.browse(cr, uid, context.get('active_id'), context=context)
             recs = []
             for line in voucher.move_ids:
                 if line.reconcile_id:
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 58f2357d452..e1c17cfacd5 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -183,7 +183,7 @@ class account_analytic_account(osv.osv):
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]
-        if not context:
+        if context is None:
             context={}
         account = self.search(cr, uid, [('code', '=', name)]+args, limit=limit, context=context)
         if not account:
diff --git a/addons/analytic/i18n/analytic.pot b/addons/analytic/i18n/analytic.pot
index e4e37441a21..a8a20895e33 100644
--- a/addons/analytic/i18n/analytic.pot
+++ b/addons/analytic/i18n/analytic.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:56+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:56+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:42+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po
index 88f3b50b2ed..8600a6559bf 100644
--- a/addons/analytic/i18n/it.po
+++ b/addons/analytic/i18n/it.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-14 14:11+0000\n"
+"PO-Revision-Date: 2010-12-16 03:21+0000\n"
 "Last-Translator: Davide Corio - Domsense <davide.corio@domsense.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
diff --git a/addons/analytic/i18n/sl.po b/addons/analytic/i18n/sl.po
index c6735913eca..88c0ff0d3c5 100644
--- a/addons/analytic/i18n/sl.po
+++ b/addons/analytic/i18n/sl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-08-03 00:15+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 11:24+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -82,7 +82,7 @@ msgstr "Čakajoči"
 #. module: analytic
 #: model:ir.model,name:analytic.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analitična postavka"
 
 #. module: analytic
 #: field:account.analytic.account,description:0
@@ -172,7 +172,7 @@ msgstr "Stanje"
 #. module: analytic
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
 
 #. module: analytic
 #: help:account.analytic.account,type:0
@@ -211,7 +211,7 @@ msgstr "Pogled"
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Stranka"
 
 #. module: analytic
 #: field:account.analytic.account,date_start:0
diff --git a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
index e273eb4e5bd..a7dc4543796 100644
--- a/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
+++ b/addons/analytic_journal_billing_rate/i18n/analytic_journal_billing_rate.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:14:53+0000\n"
-"PO-Revision-Date: 2010-12-10 17:14:53+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,16 +20,6 @@ msgstr ""
 msgid "Analytic Journal"
 msgstr ""
 
-#. module: analytic_journal_billing_rate
-#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
-msgid "Timesheet Line"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
@@ -72,7 +62,7 @@ msgid "Error! You can not create recursive analytic accounts."
 msgstr ""
 
 #. module: analytic_journal_billing_rate
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
+#: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet
+msgid "Timesheet Line"
 msgstr ""
 
diff --git a/addons/analytic_journal_billing_rate/i18n/fr.po b/addons/analytic_journal_billing_rate/i18n/fr.po
index 3e0800dbcb9..adf9da7d78c 100644
--- a/addons/analytic_journal_billing_rate/i18n/fr.po
+++ b/addons/analytic_journal_billing_rate/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-11-24 09:41+0000\n"
+"PO-Revision-Date: 2010-12-15 20:30+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -30,7 +30,7 @@ msgstr "Ligne de feuille de temps"
 #. module: analytic_journal_billing_rate
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Erreur : la référence BVR est requise."
 
 #. module: analytic_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
@@ -75,12 +75,12 @@ msgstr "Taux de Facturation"
 #. module: analytic_journal_billing_rate
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
 
 #. module: analytic_journal_billing_rate
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Erreur : Nombre BVR non valide (somme de contrôle fausse)."
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/analytic_journal_billing_rate/i18n/sl.po b/addons/analytic_journal_billing_rate/i18n/sl.po
index 6e6f5d432c4..7562e0d9527 100644
--- a/addons/analytic_journal_billing_rate/i18n/sl.po
+++ b/addons/analytic_journal_billing_rate/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:14+0000\n"
-"PO-Revision-Date: 2010-11-27 00:03+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 10:04+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
@@ -72,7 +72,7 @@ msgstr "Fakturna stopnja"
 #. module: analytic_journal_billing_rate
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
 
 #. module: analytic_journal_billing_rate
 #: constraint:account.invoice:0
diff --git a/addons/analytic_user_function/i18n/analytic_user_function.pot b/addons/analytic_user_function/i18n/analytic_user_function.pot
index 2e107e18b3c..fde40a298a6 100644
--- a/addons/analytic_user_function/i18n/analytic_user_function.pot
+++ b/addons/analytic_user_function/i18n/analytic_user_function.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:57+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:57+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/analytic_user_function/i18n/fr.po b/addons/analytic_user_function/i18n/fr.po
index 8b77ce01458..5a787884851 100644
--- a/addons/analytic_user_function/i18n/fr.po
+++ b/addons/analytic_user_function/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-12-04 09:32+0000\n"
+"PO-Revision-Date: 2010-12-15 20:30+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -67,12 +67,12 @@ msgstr ""
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de comptes analytiques récursifs."
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
 msgid "Analytic User Function"
-msgstr ""
+msgstr "Fonction utilisateur analytique"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
diff --git a/addons/analytic_user_function/i18n/sl.po b/addons/analytic_user_function/i18n/sl.po
index 789266f6149..167d55812c6 100644
--- a/addons/analytic_user_function/i18n/sl.po
+++ b/addons/analytic_user_function/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-11-27 05:38+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 10:04+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
@@ -63,7 +63,7 @@ msgstr "Tabela odnosov med uporabniki in produkti na analitičnem kontu"
 #. module: analytic_user_function
 #: constraint:account.analytic.account:0
 msgid "Error! You can not create recursive analytic accounts."
-msgstr ""
+msgstr "Napaka! Ne morete kreirati rekurzivnih analitičnih kontov."
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
diff --git a/addons/association/i18n/association.pot b/addons/association/i18n/association.pot
index 7c54fb35bd8..7fe0dfc2d9e 100644
--- a/addons/association/i18n/association.pot
+++ b/addons/association/i18n/association.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:42:57+0000\n"
-"PO-Revision-Date: 2010-12-03 15:42:57+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:43+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -40,6 +40,11 @@ msgstr ""
 msgid "Configuration Progress"
 msgstr ""
 
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Here are specific applications related to the Association Profile you selected."
+msgstr ""
+
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
@@ -65,6 +70,11 @@ msgstr ""
 msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr ""
+
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
@@ -77,7 +87,7 @@ msgstr ""
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
+msgid "Association Application Configuration"
 msgstr ""
 
 #. module: association
@@ -106,3 +116,8 @@ msgstr ""
 msgid "Project Management"
 msgstr ""
 
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Configure"
+msgstr ""
+
diff --git a/addons/association/i18n/sl.po b/addons/association/i18n/sl.po
index 3d403a1d1cc..06794f9a990 100644
--- a/addons/association/i18n/sl.po
+++ b/addons/association/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:42+0000\n"
-"PO-Revision-Date: 2010-11-12 11:44+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 10:14+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: association
@@ -24,7 +24,7 @@ msgstr "Wiki"
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Event Management"
-msgstr ""
+msgstr "Upravljanje dogodkov"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
@@ -39,12 +39,12 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Potek konfiguracije"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "title"
-msgstr ""
+msgstr "naslov"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
@@ -54,7 +54,7 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
@@ -107,7 +107,7 @@ msgstr "profile.association.config.install_modules_wizard"
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "Dogodki"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index e14799c9c7c..983bdeb0144 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -57,18 +57,16 @@ class auction_dates(osv.osv):
         return res
 
     def name_get(self, cr, uid, ids, context=None):
-        if not context:
-            context={}
         if not ids:
             return []
-        reads = self.read(cr, uid, ids, ['name', 'auction1'], context)
+        reads = self.read(cr, uid, ids, ['name', 'auction1'], context=context)
         name = [(r['id'], '['+r['auction1']+'] '+ r['name']) for r in reads]
         return name
 
-    def _get_invoice(self, cr, uid, ids, name, arg, context={}):
+    def _get_invoice(self, cr, uid, ids, name, arg, context=None):
         lots_obj = self.pool.get('auction.lots')
         result = {}
-        for data in self.browse(cr, uid, ids):
+        for data in self.browse(cr, uid, ids, context=context):
             buyer_inv_ids = []
             seller_inv_ids = []
             result[data.id] = {
@@ -76,7 +74,7 @@ class auction_dates(osv.osv):
                 'buyer_invoice_history': seller_inv_ids,
             }
             lots_ids = lots_obj.search(cr, uid, [('auction_id','=',data.id)])
-            for lot in lots_obj.browse(cr, uid, lots_ids):
+            for lot in lots_obj.browse(cr, uid, lots_ids, context=context):
                 if lot.ach_inv_id:
                     buyer_inv_ids.append(lot.ach_inv_id.id)
                 if lot.sel_inv_id:
@@ -120,8 +118,6 @@ class auction_dates(osv.osv):
 
         RETURN: True
         """
-        if not context:
-            context={}
         lots_obj = self.pool.get('auction.lots')
         lots_ids = lots_obj.search(cr, uid, [('auction_id', 'in', ids), ('state', '=', 'draft'), ('obj_price', '>', 0)])
         lots_obj.lots_invoice(cr, uid, lots_ids, {}, None)
@@ -194,12 +190,10 @@ class aie_category(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context=None):
-        if not context:
-            context = {}
         res = []
         if not ids:
             return res
-        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context)
+        reads = self.read(cr, uid, ids, ['name', 'parent_id'], context=context)
         for record in reads:
             name = record['name']
             if record['parent_id']:
@@ -229,8 +223,6 @@ auction_lot_category()
 # Lots
 #----------------------------------------------------------
 def _type_get(self, cr, uid, context=None):
-    if not context:
-        context = {}
     obj = self.pool.get('auction.lot.category')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['name'], context)
@@ -245,23 +237,15 @@ class auction_lots(osv.osv):
     _description=__doc__
 
     def button_not_bought(self, cr, uid, ids, context=None):
-        if not context:
-            context={}
         return self.write(cr, uid, ids, {'state':'unsold'})
 
     def button_taken_away(self, cr, uid, ids, context=None):
-        if not context:
-            context={}
         return self.write(cr, uid, ids, {'state':'taken_away', 'ach_emp': True})
 
     def button_unpaid(self, cr, uid, ids, context=None):
-        if not context:
-            context={}
         return self.write(cr, uid, ids, {'state':'draft'})
 
     def button_bought(self, cr, uid, ids, context=None):
-        if not context:
-            context={}
         return self.write(cr, uid, ids, {'state':'sold'})
 
     def _getprice(self, cr, uid, ids, fields, args, context=None):
@@ -271,12 +255,10 @@ class auction_lots(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary of function fields value.
         """
-        if not context:
-            context = {}
 
         res = {}
         account_analytic_line_obj = self.pool.get('account.analytic.line')
-        lots = self.browse(cr, uid, ids, context)
+        lots = self.browse(cr, uid, ids, context=context)
         pt_tax = self.pool.get('account.tax')
         for lot in lots:
             taxes = []
@@ -362,8 +344,6 @@ class auction_lots(osv.osv):
         return res
 
     def onchange_obj_ret(self, cr, uid, ids, obj_ret, context=None):
-        if not context:
-            context={}
         if obj_ret:
             return {'value': {'obj_price': 0}}
         return {}
@@ -430,16 +410,12 @@ class auction_lots(osv.osv):
     }
 
     def name_get(self, cr, user, ids, context=None):
-        if not context:
-            context={}
         if not ids:
             return []
         result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name', 'obj_num'])]
         return result
 
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None):
-        if not context:
-            context={}
         if not args:
             args = []
         ids = []
@@ -583,14 +559,12 @@ class auction_lots(osv.osv):
 
     def buyer_proforma(self, cr, uid, ids, context=None):
 
-        if not context:
-            context={}
         invoices = {}
         inv_ref = self.pool.get('account.invoice')
         res_obj = self.pool.get('res.partner')
         inv_line_obj = self.pool.get('account.invoice.line')
         wf_service = netsvc.LocalService('workflow')
-        for lot in self.browse(cr, uid, ids, context):
+        for lot in self.browse(cr, uid, ids, context=context):
             if not lot.obj_price>0:
                 continue
             if not lot.ach_uid.id:
@@ -643,12 +617,10 @@ class auction_lots(osv.osv):
         """
         # use each list of object in turn
         invoices = {}
-        if not context:
-            context={}
         inv_ref=self.pool.get('account.invoice')
         inv_line_obj = self.pool.get('account.invoice.line')
         wf_service = netsvc.LocalService('workflow')
-        for lot in self.browse(cr, uid, ids, context):
+        for lot in self.browse(cr, uid, ids, context=context):
             if not lot.auction_id.id:
                 continue
             if lot.bord_vnd_id.id in invoices:
@@ -684,7 +656,7 @@ class auction_lots(osv.osv):
             }
             inv_line_obj.create(cr, uid, inv_line, context)
             inv_ref.button_compute(cr, uid, invoices.values())
-        for inv in inv_ref.browse(cr, uid, invoices.values(), context):
+        for inv in inv_ref.browse(cr, uid, invoices.values(), context=context):
             inv_ref.write(cr, uid, [inv.id], {
                 'check_total': inv.amount_total
             })
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 87c941329d5..92dc5cc4a3c 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:00+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:00+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:45+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:45+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/auction/i18n/vi.po b/addons/auction/i18n/vi.po
index 2d048505c26..86d9d0819d0 100644
--- a/addons/auction/i18n/vi.po
+++ b/addons/auction/i18n/vi.po
@@ -1,20 +1,20 @@
 # Vietnamese translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-02 14:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 15:16+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
@@ -72,7 +72,7 @@ msgstr ""
 #: field:auction.bid_line,lot_id:0
 #: field:auction.lot.history,lot_id:0
 msgid "Object"
-msgstr ""
+msgstr "Đối tượng"
 
 #. module: auction
 #: field:report.auction.object.date,obj_num:0
@@ -205,7 +205,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Một"
 
 #. module: auction
 #: help:auction.lot.category,active:0
@@ -363,7 +363,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: auction
 #: view:auction.lots:0
@@ -376,7 +376,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: auction
 #: code:addons/auction/wizard/auction_catalog_flagey_report.py:0
@@ -387,7 +387,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: auction
 #: field:auction.bid_line,name:0
@@ -621,7 +621,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: auction
 #: model:account.tax,name:auction.auction_tax4
@@ -747,7 +747,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: auction
 #: field:report.auction,net_margin:0
@@ -921,7 +921,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười một"
 
 #. module: auction
 #: view:auction.dates:0
@@ -1176,7 +1176,7 @@ msgstr ""
 #: view:auction.lots:0
 #: view:report.auction:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: auction
 #: help:auction.dates,journal_id:0
@@ -1319,7 +1319,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: auction
 #: field:auction.bid_line,call:0
@@ -1615,7 +1615,7 @@ msgstr ""
 #. module: auction
 #: field:auction.lots,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: auction
 #: report:buyer.list:0
@@ -1950,7 +1950,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười hai"
 
 #. module: auction
 #: field:auction.lots,image:0
@@ -2178,7 +2178,7 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: auction
 #: field:auction.lots,obj_price:0
@@ -2198,12 +2198,12 @@ msgstr ""
 #. module: auction
 #: selection:report.auction,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: auction
 #: selection:report.auction,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: auction
 #: view:auction.pay.buy:0
diff --git a/addons/auction/report/huissier.py b/addons/auction/report/huissier.py
index 2718e8bedc2..1b5f7cc68d7 100644
--- a/addons/auction/report/huissier.py
+++ b/addons/auction/report/huissier.py
@@ -31,9 +31,9 @@ class report_custom(report_rml):
     def __init__(self, name, table, tmpl, xsl):
         report_rml.__init__(self, name, table, tmpl, xsl)
 
-    def create_xml(self,cr, uid, ids, datas, context={}):
+    def create_xml(self,cr, uid, ids, datas, context=None):
         pool= pooler.get_pool(cr.dbname)
-        lots = pool.get('auction.lots').browse(cr, uid, ids)
+        lots = pool.get('auction.lots').browse(cr, uid, ids, context=context)
         auction = lots[0].auction_id
 
         xml = '''<?xml version="1.0" encoding="UTF-8"?>
diff --git a/addons/auction/report/report_auction.py b/addons/auction/report/report_auction.py
index 25cdab88e89..406aedbed89 100644
--- a/addons/auction/report/report_auction.py
+++ b/addons/auction/report/report_auction.py
@@ -28,8 +28,6 @@ import time
 import tools
 
 def _type_get(self, cr, uid, context=None):
-    if not context:
-        context = {}
     obj = self.pool.get('auction.lot.category')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['name'], context)
diff --git a/addons/auction/report/total.py b/addons/auction/report/total.py
index a5b937c3ad8..a198a7c4416 100644
--- a/addons/auction/report/total.py
+++ b/addons/auction/report/total.py
@@ -35,7 +35,7 @@ class report_custom(report_rml):
     def __init__(self, name, table, tmpl, xsl):
         report_rml.__init__(self, name, table, tmpl, xsl)
 
-    def create_xml(self, cr, uid, ids, datas, context={}):
+    def create_xml(self, cr, uid, ids, datas, context=None):
         service = netsvc.LocalService("object_proxy")
 
         lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', ids, ['obj_price','ach_login','obj_comm','lot_est1','lot_est2','bord_vnd_id','ach_emp','auction_id'])
diff --git a/addons/auction/wizard/auction_aie_send.py b/addons/auction/wizard/auction_aie_send.py
index f11c9388021..7c904cf850b 100644
--- a/addons/auction/wizard/auction_aie_send.py
+++ b/addons/auction/wizard/auction_aie_send.py
@@ -34,7 +34,7 @@ class auction_lots_send_aie(osv.osv_memory):
     _name = 'auction.lots.send.aie'
     _descritption = 'Send to website'
     
-    def _date_get(self, cr, uid, context={}):
+    def _date_get(self, cr, uid, context=None):
         selection = context and context.get('selection')
         if selection:
             return [('','')] + selection
@@ -50,7 +50,7 @@ class auction_lots_send_aie(osv.osv_memory):
         'img_send': fields.boolean('Send Image also ?'),   
     }
     
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
          To get default values for the object.
          @param self: The object pointer.
@@ -60,6 +60,8 @@ class auction_lots_send_aie(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """
+        if context is None: 
+            context = {}
         res = super(auction_lots_send_aie, self).default_get(cr, uid, fields, context=context)
         if 'uname' in fields and context.get('uname',False):
             res['uname'] = context.get('uname')
@@ -147,7 +149,9 @@ class auction_lots_send_aie(osv.osv_memory):
                 fname = datas[0]['name']
                 self._photo_bin_send(uname, passwd, ref, did, fname, bin)
     
-    def get_dates(self, cr, uid, ids, context={}):
+    def get_dates(self, cr, uid, ids, context=None):
+        if context is None: 
+            context = {}
         import httplib
         data_obj = self.pool.get('ir.model.data')
         conn = httplib.HTTPConnection('www.auction-in-europe.com')
@@ -174,14 +178,16 @@ class auction_lots_send_aie(osv.osv_memory):
             'context': context
         }
     
-    def _send(self, cr, uid, ids, context={}):
+    def _send(self, cr, uid, ids, context=None):
         import pickle, thread, sql_db
         cr.execute('select name,aie_categ from auction_lot_category')
         vals = dict(cr.fetchall())
         cr.close()
+        if context is None: 
+            context = {}
     
         service = netsvc.LocalService("object_proxy")
-        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context['active_ids'],  ['obj_num','lot_num','obj_desc','bord_vnd_id','lot_est1','lot_est2','artist_id','lot_type','aie_categ'])
+        lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context.get('active_ids',[]),  ['obj_num','lot_num','obj_desc','bord_vnd_id','lot_est1','lot_est2','artist_id','lot_type','aie_categ'])
         lots_ids = []
         datas = self.read(cr, uid, ids[0],['uname','login','lang','numerotation','dates'])
         for l in lots:
@@ -211,7 +217,7 @@ class auction_lots_send_aie(osv.osv_memory):
             thread.start_new_thread(_photos_send, (cr.dbname, uid, datas['uname'], datas['password'],datas['dates'], lots_ids))
         return {}
     
-    def send_pdf(self, cr, uid, ids, context):
+    def send_pdf(self, cr, uid, ids, context=None):
         threaded_calculation = threading.Thread(target=self._send, args=(cr, uid, ids, context))
         threaded_calculation.start()
         return {}
diff --git a/addons/auction/wizard/auction_aie_send_result.py b/addons/auction/wizard/auction_aie_send_result.py
index 404881b2d6b..5b2b4eca7fd 100644
--- a/addons/auction/wizard/auction_aie_send_result.py
+++ b/addons/auction/wizard/auction_aie_send_result.py
@@ -32,7 +32,7 @@ class auction_lots_pay(osv.osv_memory):
     _description = 'Send results to Auction-in-europe.com'
     
     
-    def _date_get(self, cr, uid, context={}):
+    def _date_get(self, cr, uid, context=None):
         selection = context and context.get('selection')
         if selection:
             return [('','')] + selection
@@ -45,7 +45,7 @@ class auction_lots_pay(osv.osv_memory):
         'dates': fields.selection(_date_get,'Auction Date'),
     }
     
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
          To get default values for the object.
          @param self: The object pointer.
@@ -55,6 +55,8 @@ class auction_lots_pay(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """
+        if context is None: 
+            context = {}
         res = super(auction_lots_pay, self).default_get(cr, uid, fields, context=context)
         if 'uname' in fields and context.get('uname',False):
             res['uname'] = context.get('uname')
@@ -96,7 +98,9 @@ class auction_lots_pay(osv.osv_memory):
             return val
         return post_multipart('auction-in-europe.com', "/bin/catalog_result.cgi", (('uname',uname),('password',passwd),('did',did)),(('file',catalog),))
     
-    def get_dates(self, cr, uid, ids, context):
+    def get_dates(self, cr, uid, ids, context=None):
+        if context is None: 
+            context = {}
         import httplib
         conn = httplib.HTTPConnection('www.auction-in-europe.com')
         data_obj = self.pool.get('ir.model.data')
@@ -124,7 +128,9 @@ class auction_lots_pay(osv.osv_memory):
             'context': context
         }
     
-    def send(self, cr, uid, ids, context):
+    def send(self, cr, uid, ids, context=None):
+        if context is None: 
+            context = {}
         import pickle
         service = netsvc.LocalService("object_proxy")
         datas = self.read(cr, uid, ids[0],['uname','password','dates'])
diff --git a/addons/auction/wizard/auction_catalog_flagey_report.py b/addons/auction/wizard/auction_catalog_flagey_report.py
index b5bff2d2858..03c8236c55c 100644
--- a/addons/auction/wizard/auction_catalog_flagey_report.py
+++ b/addons/auction/wizard/auction_catalog_flagey_report.py
@@ -27,7 +27,7 @@ class auction_catalog_flagey(osv.osv_memory):
     _name = 'auction.catalog.flagey'
     _description = 'Auction Catalog Flagey'
     
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
          To get default values for the object.
          @param self: The object pointer.
@@ -40,7 +40,7 @@ class auction_catalog_flagey(osv.osv_memory):
         res = super(auction_catalog_flagey, self).default_get(cr, uid, fields, context=context)
         return res
     
-    def view_init(self, cr, uid, fields, context):
+    def view_init(self, cr, uid, fields, context=None):
         """ 
          Creates view dynamically, adding fields at runtime, raises exception
          at the time of initialization of view.
@@ -53,15 +53,17 @@ class auction_catalog_flagey(osv.osv_memory):
         """
         lots_obj = self.pool.get('auction.lots')
         auc_dates_obj = self.pool.get('auction.dates')
+        if context is None: 
+            context = {}
         current_auction = auc_dates_obj.browse(cr, uid, context.get('active_ids', []))
         v_lots = lots_obj.search(cr, uid, [('auction_id','=',current_auction.id)])
-        v_ids = lots_obj.browse(cr, uid, v_lots)
+        v_ids = lots_obj.browse(cr, uid, v_lots, context=context)
         for ab in v_ids:
             if not ab.auction_id :
                 raise osv.except_osv(_('Error!'), _('No Lots belong to this Auction Date'))
         pass
     
-    def print_report(self, cr, uid, ids, context):
+    def print_report(self, cr, uid, ids, context=None):
         """ 
          Prints auction catalog flagey report.
          @param self: The object pointer.
@@ -71,6 +73,8 @@ class auction_catalog_flagey(osv.osv_memory):
          @param context: A standard dictionary 
          @return: Report  
         """
+        if context is None: 
+            context = {}
         datas = {'ids': context.get('active_ids',[])}
         return {
             'type': 'ir.actions.report.xml',
diff --git a/addons/auction/wizard/auction_lots_able.py b/addons/auction/wizard/auction_lots_able.py
index 8ddeeca8055..369d762727a 100644
--- a/addons/auction/wizard/auction_lots_able.py
+++ b/addons/auction/wizard/auction_lots_able.py
@@ -31,14 +31,16 @@ class auction_lots_able(osv.osv_memory):
     _name = "auction.lots.able"
     _description = "Lots able"
     
-    def confirm_able(self, cr, uid, ids, context={}):
+    def confirm_able(self, cr, uid, ids, context=None):
         """
             This function Update auction lots object and set taken away field true.
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param ids: List of auction lots able’s IDs.
         """
-        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'ach_emp':True})
+        if context is None: 
+            context = {}
+        self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'ach_emp':True})
         return {}
     
 auction_lots_able()
diff --git a/addons/auction/wizard/auction_lots_auction_move.py b/addons/auction/wizard/auction_lots_auction_move.py
index cb19f65172c..97330f922fe 100644
--- a/addons/auction/wizard/auction_lots_auction_move.py
+++ b/addons/auction/wizard/auction_lots_auction_move.py
@@ -44,13 +44,13 @@ class auction_lots_auction_move(osv.osv_memory):
         @param uid: the current user’s ID for security checks,
         @param ids: List of auction lots auction move’s IDs.
         """
-        if not context:
+        if context is None:
             context={}
         auction_bid_line_obj = self.pool.get('auction.bid_line')
         auction_lot_history_obj = self.pool.get('auction.lot.history')
         auction_lots_obj = self.pool.get('auction.lots')
         rec_ids =  auction_lots_obj.browse(cr, uid, context.get('active_ids', []))
-        for current in self.browse(cr, uid, ids, context):
+        for current in self.browse(cr, uid, ids, context=context):
             if not (current.auction_id and len(context.get('active_ids', []))):
                 return {}
 
diff --git a/addons/auction/wizard/auction_lots_buyer_map.py b/addons/auction/wizard/auction_lots_buyer_map.py
index 98d26b83b4f..e50f11fd1ec 100644
--- a/addons/auction/wizard/auction_lots_buyer_map.py
+++ b/addons/auction/wizard/auction_lots_buyer_map.py
@@ -32,7 +32,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
         'ach_uid': fields.many2one('res.partner','Buyer', required=True),
     }
 
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
          To get default values for the object.
          @param self: The object pointer.
@@ -42,14 +42,16 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """
-        res = super(wiz_auc_lots_buyer_map,self).default_get(cr, uid, fields, context)
+        if context is None: 
+            context = {}
+        res = super(wiz_auc_lots_buyer_map,self).default_get(cr, uid, fields, context=context)
         auction_lots_obj = self.pool.get('auction.lots')
         lots_ids = auction_lots_obj.search(cr, uid, [('ach_uid', '=', ''), ('ach_login', '!=', '')])
-        for rec in auction_lots_obj.browse(cr, uid, lots_ids, context):
+        for rec in auction_lots_obj.browse(cr, uid, lots_ids, context=context):
             if (not rec.ach_uid or not rec.ach_login):
-                res.update(self._start(cr, uid, context.get('active_ids', []), context))
+                res.update(self._start(cr, uid, context.get('active_ids', []), context=context))
             return res
-        res.update(self._start(cr, uid, context.get('active_ids', []), context))
+        res.update(self._start(cr, uid, context.get('active_ids', []), context=context))
         return res
     
     def _start(self, cr, uid, ids, context=None):
@@ -62,10 +64,8 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
          @param context: A standard dictionary 
          @return: login field from current record. 
         """
-        if not context:
-            context={}
         lots_obj = self.pool.get('auction.lots')
-        for rec in lots_obj.browse(cr, uid, ids, context):
+        for rec in lots_obj.browse(cr, uid, ids, context=context):
             if (len(ids)==1) and (not rec.ach_uid and not rec.ach_login):
                 raise osv.except_osv(_('Error'), _('No buyer is set for this lot.'))
             if not rec.ach_uid and rec.ach_login:
@@ -81,13 +81,13 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
          @param ids: List of ids 
          @param context: A standard dictionary 
         """
-        if not context:
+        if context is None:
             context={}
         rec_ids = context and context.get('active_ids',[]) or []
         assert rec_ids, _('Active IDs not Found')
         lots_obj = self.pool.get('auction.lots')
-        for current in self.browse(cr, uid, ids):
-            for lots in lots_obj.browse(cr, uid, rec_ids, context):
+        for current in self.browse(cr, uid, ids, context=context):
+            for lots in lots_obj.browse(cr, uid, rec_ids, context=context):
                 if lots.ach_login == current.ach_login:
                     lots_obj.write(cr, uid, [lots.id], {'ach_uid': current.ach_uid.id}, context=context)
         return {}
@@ -102,7 +102,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
          @param context: A standard dictionary 
          @return: New arch of view.
         """
-        if not context:
+        if context is None:
             context={}
         record_ids = context and context.get('active_ids', []) or []
         res = super(wiz_auc_lots_buyer_map, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
@@ -111,7 +111,7 @@ class wiz_auc_lots_buyer_map(osv.osv_memory):
         lots_obj = self.pool.get('auction.lots')
         if record_ids:
             try:
-                for lots in lots_obj.browse(cr, uid, record_ids):
+                for lots in lots_obj.browse(cr, uid, record_ids, context=context):
                     if lots.ach_uid:
                         res['arch'] = """
                                 <form title="Mapping Result">
diff --git a/addons/auction/wizard/auction_lots_cancel.py b/addons/auction/wizard/auction_lots_cancel.py
index 3d443a98e15..62313315bd9 100644
--- a/addons/auction/wizard/auction_lots_cancel.py
+++ b/addons/auction/wizard/auction_lots_cancel.py
@@ -40,11 +40,11 @@ class auction_lots_cancel(osv.osv):
             @param context: A standard dictionary
             @return:
             """
-            if not context:
+            if context is None:
                 context={}
             lots_obj = self.pool.get('auction.lots')
             invoice_obj = self.pool.get('account.invoice')
-            lot = lots_obj.browse(cr, uid, context.get('active_id', False), context)
+            lot = lots_obj.browse(cr, uid, context.get('active_id', False), context=context)
             if lot.ach_inv_id:
                     supplier_refund_inv_id = invoice_obj.refund(cr, uid, [lot.ach_inv_id.id])
             if lot.sel_inv_id:
diff --git a/addons/auction/wizard/auction_lots_enable.py b/addons/auction/wizard/auction_lots_enable.py
index 65cb0c4d49e..ed6b8950d2e 100644
--- a/addons/auction/wizard/auction_lots_enable.py
+++ b/addons/auction/wizard/auction_lots_enable.py
@@ -28,14 +28,16 @@ class auction_lots_enable(osv.osv_memory):
         'confirm_en':fields.integer('Catalog Number')
     }
     
-    def confirm_enable(self, cr, uid, ids, context={}):
+    def confirm_enable(self, cr, uid, ids, context=None):
         """
         This function Update auction lots object and set taken away field False.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of auction lots enable’s IDs.
         """
-        self.pool.get('auction.lots').write(cr, uid, context['active_id'], {'ach_emp':False})
+        if context is None: 
+            context = {}
+        self.pool.get('auction.lots').write(cr, uid, context.get('active_id',False), {'ach_emp':False})
         return {}
     
 auction_lots_enable()
diff --git a/addons/auction/wizard/auction_lots_invoice.py b/addons/auction/wizard/auction_lots_invoice.py
index 89d66f5f2d5..66bb5e42f2b 100644
--- a/addons/auction/wizard/auction_lots_invoice.py
+++ b/addons/auction/wizard/auction_lots_invoice.py
@@ -36,7 +36,7 @@ class auction_lots_invoice(osv.osv_memory):
         'number': fields.integer('Invoice Number'),
     }
 
-    def default_get(self, cr, uid, fields, context={}):
+    def default_get(self, cr, uid, fields, context=None):
         """
          To get default values for the object.
          @param self: The object pointer.
@@ -46,6 +46,8 @@ class auction_lots_invoice(osv.osv_memory):
          @param context: A standard dictionary
          @return: A dictionary which of fields with values.
         """
+        if context is None: 
+            context = {}
         res = super(auction_lots_invoice, self).default_get(cr, uid, fields, context=context)
         service = netsvc.LocalService("object_proxy")
         lots = service.execute(cr.dbname, uid, 'auction.lots', 'read', context.get('active_ids', []))
@@ -78,7 +80,7 @@ class auction_lots_invoice(osv.osv_memory):
 
     #TODO: recuperer id next invoice (de la sequence)???
         invoice_number = False
-        for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', [])):
+        for lot in self.pool.get('auction.lots').browse(cr, uid, context.get('active_ids', []), context=context):
             if 'objects' in fields:
                 res.update({'objects':len(context.get('active_ids', []))})
             if 'amount' in fields:
@@ -93,7 +95,7 @@ class auction_lots_invoice(osv.osv_memory):
                 res.update({'number':invoice_number})
         return res
 
-    def print_report(self, cr, uid, ids, context={}):
+    def print_report(self, cr, uid, ids, context=None):
         """
         Create an invoice report.
         @param cr: the current row, from the database cursor.
@@ -101,6 +103,8 @@ class auction_lots_invoice(osv.osv_memory):
         @param ids: List of Auction lots make invoice buyer’s IDs
         @return: dictionary of  account invoice form.
         """
+        if context is None: 
+            context = {}
         service = netsvc.LocalService("object_proxy")
         datas = {'ids' : context.get('active_ids',[])}
         res = self.read(cr, uid, ids, ['number','ach_uid'])
diff --git a/addons/auction/wizard/auction_lots_make_invoice.py b/addons/auction/wizard/auction_lots_make_invoice.py
index 5d32e644283..3a87a202b74 100644
--- a/addons/auction/wizard/auction_lots_make_invoice.py
+++ b/addons/auction/wizard/auction_lots_make_invoice.py
@@ -50,11 +50,11 @@ class auction_lots_make_invoice(osv.osv_memory):
         @param context: A standard dictionary 
         @return: A dictionary which of fields with values. 
         """        
-        if not context:
+        if context is None:
             context={}
         res = super(auction_lots_make_invoice, self).default_get(cr, uid, fields, context=context)
         lots_obj = self.pool.get('auction.lots') 
-        for lot in lots_obj.browse(cr, uid, context.get('active_ids', [])):
+        for lot in lots_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if 'amount' in fields:
                 res.update({'amount': lot.seller_price})                
             if 'objects' in fields:
@@ -69,13 +69,13 @@ class auction_lots_make_invoice(osv.osv_memory):
         @param ids: List of Auction lots make invoice’s IDs
         @return: dictionary of  account invoice form.
         """
-        if not context:
+        if context is None:
             context={}
         order_obj = self.pool.get('auction.lots')
         mod_obj = self.pool.get('ir.model.data') 
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         id = mod_obj.read(cr, uid, result, ['res_id'])
-        lots_ids = order_obj.seller_trans_create(cr, uid, context.get('active_ids', []), context)
+        lots_ids = order_obj.seller_trans_create(cr, uid, context.get('active_ids', []), context=context)
         return {
             'domain': "[('id','in', ["+','.join(map(str, lots_ids))+"])]", 
             'name': 'Seller invoices', 
diff --git a/addons/auction/wizard/auction_lots_make_invoice_buyer.py b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
index 5eb9a649556..dc39ccbb717 100644
--- a/addons/auction/wizard/auction_lots_make_invoice_buyer.py
+++ b/addons/auction/wizard/auction_lots_make_invoice_buyer.py
@@ -45,11 +45,11 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """        
-        if not context:
+        if context is None:
             context={}
         res = super(auction_lots_make_invoice_buyer, self).default_get(cr, uid, fields, context=context)
         lots_obj=self.pool.get('auction.lots')
-        for lot in lots_obj.browse(cr, uid, context.get('active_ids', [])):
+        for lot in lots_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if 'amount' in fields:
                 res.update({'amount': lot.buyer_price})                
             if 'buyer_id' in fields:
@@ -58,7 +58,7 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
                 res.update({'objects': len(context.get('active_ids', []))})   
         return res
 
-    def makeInvoices(self, cr, uid, ids, context):
+    def makeInvoices(self, cr, uid, ids, context=None):
         """
         Create an invoice for selected lots (IDS) to BUYER_ID .
         @param cr: the current row, from the database cursor.
@@ -70,8 +70,8 @@ class auction_lots_make_invoice_buyer(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data') 
         result = mod_obj._get_id(cr, uid, 'account', 'view_account_invoice_filter')
         id = mod_obj.read(cr, uid, result, ['res_id'])
-        lots = order_obj.browse(cr, uid, context.get('active_ids', []))
-        for current in self.browse(cr, uid, ids, context):            
+        lots = order_obj.browse(cr, uid, context.get('active_ids', []), context=context)
+        for current in self.browse(cr, uid, ids, context=context):
             invoice_number = current.number
             for lot in lots:
                 up_auction = order_obj.write(cr, uid, [lot.id], {'ach_uid': current.buyer_id.id})
diff --git a/addons/auction/wizard/auction_lots_numerotate.py b/addons/auction/wizard/auction_lots_numerotate.py
index 9c41d1d4f70..0712e21565e 100644
--- a/addons/auction/wizard/auction_lots_numerotate.py
+++ b/addons/auction/wizard/auction_lots_numerotate.py
@@ -38,7 +38,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
         'obj_num': fields.integer('Catalog Number', required=True)
     }
     
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
          To get default values for the object.
          @param self: The object pointer.
@@ -48,13 +48,14 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """
+        if context is None: context = {}
         res = super(auction_lots_numerotate_per_lot, self).default_get(cr, uid, fields, context=context)
         active_id = context.get('active_id',False)
         active_model = context.get('active_model')
         if active_id and (active_model and active_model!='auction.lots'):
             return res
         lots_obj = self.pool.get('auction.lots')
-        lots = lots_obj.browse(cr, uid, active_id)
+        lots = lots_obj.browse(cr, uid, active_id, context=context)
         if 'bord_vnd_id' in fields and context.get('bord_vnd_id',False):
             res['bord_vnd_id'] = context.get('bord_vnd_id')
         if 'lot_num' in fields and context.get('lot_num',False):
@@ -71,7 +72,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
             res['obj_num'] = lots.obj_num
         return res
     
-    def open_init_form(self, cr, uid, ids, context={}):
+    def open_init_form(self, cr, uid, ids, context=None):
         record_ids = context and context.get('active_ids',False) or False
         assert record_ids, _('Active IDs not Found')
         data_obj = self.pool.get('ir.model.data')
@@ -89,7 +90,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
             'context': context
         }
     
-    def numerotate(self, cr, uid, ids, context={}):
+    def numerotate(self, cr, uid, ids, context=None):
         record_ids = context and context.get('active_ids',False) or False
         assert record_ids, _('Active IDs not Found')
         datas = self.read(cr, uid, ids[0], ['bord_vnd_id','lot_num','obj_num'])
@@ -116,7 +117,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
             'context': context
         }
     
-    def read_record(self, cr, uid, ids, context={}):
+    def read_record(self, cr, uid, ids, context=None):
         record_ids = context and context.get('active_ids',False) or False
         assert record_ids, _('Active IDs not Found')
         datas = self.read(cr, uid, ids[0], ['bord_vnd_id','lot_num'])
@@ -131,7 +132,7 @@ class auction_lots_numerotate_per_lot(osv.osv_memory):
                                    'lot_est2', 'obj_desc'])
         return lots_datas[0]
     
-    def test_exist(self, cr, uid, ids, context={}):
+    def test_exist(self, cr, uid, ids, context=None):
         record_ids = context and context.get('active_ids',False) or False
         assert record_ids, _('Active IDs not Found')
         data_obj = self.pool.get('ir.model.data')
@@ -167,13 +168,13 @@ class auction_lots_numerotate(osv.osv_memory):
         'number': fields.integer('First Number', required=True)   
     }
    
-    def numerotate_cont(self, cr, uid, ids, context={}):
+    def numerotate_cont(self, cr, uid, ids, context=None):
         record_ids = context and context.get('active_ids',False) or False
         assert record_ids, _('Active IDs not Found')
         datas = self.read(cr, uid, ids[0], ['number'])
         nbr = int(datas['number'])
         lots_obj = self.pool.get('auction.lots')
-        rec_ids = lots_obj.browse(cr, uid, record_ids)
+        rec_ids = lots_obj.browse(cr, uid, record_ids, context=context)
         for rec_id in rec_ids:
             lots_obj.write(cr, uid, [rec_id.id], {'obj_num':nbr})
             nbr+=1
diff --git a/addons/auction/wizard/auction_lots_sms_send.py b/addons/auction/wizard/auction_lots_sms_send.py
index 094ecea1ca2..93faab41275 100644
--- a/addons/auction/wizard/auction_lots_sms_send.py
+++ b/addons/auction/wizard/auction_lots_sms_send.py
@@ -34,7 +34,7 @@ class auction_lots_sms_send(osv.osv_memory):
                'text':fields.text('SMS Message', required=True)
     }
     
-    def sms_send(self, cr, uid, ids, context):
+    def sms_send(self, cr, uid, ids, context=None):
         """
             to send sms
             
@@ -44,18 +44,18 @@ class auction_lots_sms_send(osv.osv_memory):
             @param context: A standard dictionary 
             @return: number indicating the acknowledgement
         """
-                
+        if context is None: context = {}
         lot_obj = self.pool.get('auction.lots')
         partner_obj = self.pool.get('res.partner')
         partner_address_obj = self.pool.get('res.partner.address')
-        for data in self.read(cr, uid, ids):
-            lots = lot_obj.read(cr, uid, context['active_ids'], ['obj_num','obj_price','ach_uid'])
+        for data in self.read(cr, uid, ids, context=context):
+            lots = lot_obj.read(cr, uid, context.get('active_ids', []), ['obj_num','obj_price','ach_uid'])
             res = partner_obj.read(cr, uid, [l['ach_uid'][0] for l in lots if l['ach_uid']], ['gsm'], context)
             
             nbr = 0
             for r in res:
                 add = partner_obj.address_get(cr, uid, [r['id']])['default']
-                addr = partner_address_obj.browse(cr, uid, add)
+                addr = partner_address_obj.browse(cr, uid, add, context=context)
                 to = addr.mobile
                 if to:
                     tools.smssend(data['user'], data['password'], data['app_id'], unicode(data['text'], 'utf-8').encode('latin1'), to)
diff --git a/addons/auction/wizard/auction_pay_buy.py b/addons/auction/wizard/auction_pay_buy.py
index bf6a85cf74b..dfad93dc759 100644
--- a/addons/auction/wizard/auction_pay_buy.py
+++ b/addons/auction/wizard/auction_pay_buy.py
@@ -48,11 +48,11 @@ class auction_pay_buy(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """        
-        if not context:
+        if context is None:
             context={}
         res = super(auction_pay_buy, self).default_get(cr, uid, fields, context=context)
         auction_lots_obj= self.pool.get('auction.lots')       
-        for lot in auction_lots_obj.browse(cr, uid, context.get('active_ids', [])):
+        for lot in auction_lots_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if 'amount' in fields:
                 res.update({'amount': lot.buyer_price})                
             if 'buyer_id' in fields:
@@ -61,7 +61,7 @@ class auction_pay_buy(osv.osv_memory):
                 res.update({'total': lot.buyer_price})     
         return res
     
-    def pay_and_reconcile(self, cr, uid, ids, context):
+    def pay_and_reconcile(self, cr, uid, ids, context=None):
         """
         Pay and Reconcile
         @param cr: the current row, from the database cursor.
@@ -70,15 +70,16 @@ class auction_pay_buy(osv.osv_memory):
         @param context: A standard dictionary 
         @return: 
         """        
+        if context is None: context = {}
         lot_obj = self.pool.get('auction.lots')
         bank_statement_line_obj = self.pool.get('account.bank.statement.line')
         
-        for datas in self.read(cr, uid, ids):
+        for datas in self.read(cr, uid, ids, context=context):
             if not abs(datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])) <0.01:
                 rest = datas['total'] - (datas['amount'] + datas['amount2'] + datas['amount3'])
                 raise osv.except_osv(_('Payment aborted !'), _('You should pay all the total: "%.2f" are missing to accomplish the payment.') %(round(rest, 2)))
     
-            lots = lot_obj.browse(cr, uid, context['active_ids'], context)
+            lots = lot_obj.browse(cr, uid, context.get('active_ids', []), context=context)
             for lot in lots:
                 if datas['buyer_id']:
                     lot_obj.write(cr, uid, [lot.id], {'ach_uid': datas['buyer_id']})
diff --git a/addons/auction/wizard/auction_pay_sel.py b/addons/auction/wizard/auction_pay_sel.py
index a6444f8d646..7265a4e7f98 100644
--- a/addons/auction/wizard/auction_pay_sel.py
+++ b/addons/auction/wizard/auction_pay_sel.py
@@ -33,7 +33,7 @@ class auction_pay_sel(osv.osv_memory):
        'period_id':fields.many2one('account.period', 'Period', required=True),
     }
 
-    def pay_and_reconcile(self, cr, uid, ids, context):
+    def pay_and_reconcile(self, cr, uid, ids, context=None):
         """
         Pay and Reconcile
         @param cr: the current row, from the database cursor.
@@ -42,9 +42,11 @@ class auction_pay_sel(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
-        lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context)
+        if context is None: 
+            context = {}
+        lot = self.pool.get('auction.lots').browse(cr, uid, context['active_id'], context=context)
         invoice_obj = self.pool.get('account.invoice')
-        for datas in self.read(cr, uid, ids):
+        for datas in self.read(cr, uid, ids, context=context):
             account_id = datas.get('writeoff_acc_id', False)
             period_id = datas.get('period_id', False)
             journal_id = datas.get('journal_id', False)
diff --git a/addons/auction/wizard/auction_payer_sel.py b/addons/auction/wizard/auction_payer_sel.py
index 087eacce9d7..808826cfc23 100644
--- a/addons/auction/wizard/auction_payer_sel.py
+++ b/addons/auction/wizard/auction_payer_sel.py
@@ -25,7 +25,9 @@ class auction_payer(osv.osv_memory):
     _name = "auction.payer"
     _description = "Auction payer"
     
-    def payer(self, cr, uid, ids, context):
+    def payer(self, cr, uid, ids, context=None):
+        if context is None: 
+            context = {}
         self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'is_ok':True, 'state':'paid'})
         return {}
     
@@ -38,14 +40,16 @@ class auction_payer_sel(osv.osv_memory):
     _name = "auction.payer.sel"
     _description = "Auction payment for seller"
     
-    def payer_sel(self, cr, uid, ids, context):
+    def payer_sel(self, cr, uid, ids, context=None):
         """
         This function Update auction lots object and seller paid  true.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of auction payer sel’s IDs.
         """
-        self.pool.get('auction.lots').write(cr, uid, context['active_ids'], {'paid_vnd':True})
+        if context is None: 
+            context = {}
+        self.pool.get('auction.lots').write(cr, uid, context.get('active_ids', []), {'paid_vnd':True})
         return {}
     
 auction_payer_sel()
diff --git a/addons/auction/wizard/auction_taken.py b/addons/auction/wizard/auction_taken.py
index ff79000d898..8ada436ae5d 100644
--- a/addons/auction/wizard/auction_taken.py
+++ b/addons/auction/wizard/auction_taken.py
@@ -42,10 +42,10 @@ class auction_taken(osv.osv_memory):
           @param ids: List of Auction taken’s IDs
           @return: dictionary of lot_ids fields with empty list 
           """
-          if not context:
+          if context is None:
               context={}
           lot_obj = self.pool.get('auction.lots')
-          for current in self.browse(cr, uid, ids, context):
+          for current in self.browse(cr, uid, ids, context=context):
               for lot in current.lot_ids:
                   lot_obj.write(cr, uid, lot.id, {'state':'taken_away', 'ach_emp': True})
               return {'lot_ids': []}
diff --git a/addons/auction/wizard/auction_transfer_unsold_object.py b/addons/auction/wizard/auction_transfer_unsold_object.py
index d2b38811daa..8bc0cb8cb5b 100644
--- a/addons/auction/wizard/auction_transfer_unsold_object.py
+++ b/addons/auction/wizard/auction_transfer_unsold_object.py
@@ -29,7 +29,7 @@ class auction_transfer_unsold_object(osv.osv):
         _name = 'auction.transfer.unsold.object'
         _description = 'To transfer unsold objects'
 
-        def _start(self, cr, uid, context):
+        def _start(self, cr, uid, context=None):
             """ 
             To initialize auction_id_from
             @param self: The object pointer.
@@ -40,7 +40,7 @@ class auction_transfer_unsold_object(osv.osv):
             @return: auction_id_from
             """
             lots_obj = self.pool.get('auction.lots')
-            rec = lots_obj.browse(cr, uid, context['active_id'], context)
+            rec = lots_obj.browse(cr, uid, context.get('active_id', False), context=context)
             auction_from = rec and rec.auction_id.id or False
             return  auction_from
         
@@ -53,7 +53,7 @@ class auction_transfer_unsold_object(osv.osv):
             'auction_id_from': _start,
         }
         
-        def transfer_unsold_object(self, cr, uid, ids, context):
+        def transfer_unsold_object(self, cr, uid, ids, context=None):
             """ 
             To Transfer the unsold object
             @param self: The object pointer.
@@ -63,15 +63,16 @@ class auction_transfer_unsold_object(osv.osv):
             @param context: A standard dictionary 
             @return: 
             """
+            if context is None: context = {}
             bid_line_obj = self.pool.get('auction.bid_line')
             lots_obj = self.pool.get('auction.lots')
             lot_history_obj = self.pool.get('auction.lot.history')
-            line_ids= bid_line_obj.search(cr, uid, [('lot_id','in',context['active_ids'])])
+            line_ids= bid_line_obj.search(cr, uid, [('lot_id','in',context.get('active_ids', []))])
             bid_line_obj.unlink(cr, uid, line_ids)
             
-            res = self.browse(cr, uid, ids)        
+            res = self.browse(cr, uid, ids, context=context)        
             unsold_ids = lots_obj.search(cr,uid,[('auction_id','=',res[0].auction_id_from.id),('state','=','unsold')])
-            for rec in lots_obj.browse(cr, uid, unsold_ids, context):
+            for rec in lots_obj.browse(cr, uid, unsold_ids, context=context):
                 new_id = lot_history_obj.create(cr, uid, {'auction_id':rec.auction_id.id,'lot_id':rec.id,'price': rec.obj_ret, 'name': rec.auction_id.auction1})
                 up_auction = lots_obj.write(cr, uid, [rec.id], {'auction_id': res[0].auction_id_to.id,
                                                                                                 'obj_ret':None,
diff --git a/addons/audittrail/i18n/audittrail.pot b/addons/audittrail/i18n/audittrail.pot
index 509f4f2f4ef..06d97b42a7e 100644
--- a/addons/audittrail/i18n/audittrail.pot
+++ b/addons/audittrail/i18n/audittrail.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:00+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:00+0000\n"
+"POT-Creation-Date: 2010-12-15 15:04:46+0000\n"
+"PO-Revision-Date: 2010-12-15 15:04:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/audittrail/i18n/sl.po b/addons/audittrail/i18n/sl.po
index c0418dfc3ce..4c3ebe3864e 100644
--- a/addons/audittrail/i18n/sl.po
+++ b/addons/audittrail/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-03 00:52+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 10:13+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -54,7 +54,7 @@ msgstr "Revidiraj dnevnike"
 #: view:audittrail.log:0
 #: view:audittrail.rule:0
 msgid "Group By..."
-msgstr ""
+msgstr "Združi po ..."
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -65,7 +65,7 @@ msgstr "Stanje"
 #. module: audittrail
 #: view:audittrail.rule:0
 msgid "_Subscribe"
-msgstr ""
+msgstr "_Naroči"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -177,7 +177,7 @@ msgstr "Stara vrednost: "
 #. module: audittrail
 #: field:audittrail.log,name:0
 msgid "Resource Name"
-msgstr ""
+msgstr "Naziv vira"
 
 #. module: audittrail
 #: view:audittrail.log:0
diff --git a/addons/audittrail/wizard/audittrail_view_log.py b/addons/audittrail/wizard/audittrail_view_log.py
index f1329b58a0d..65165c1d2d8 100644
--- a/addons/audittrail/wizard/audittrail_view_log.py
+++ b/addons/audittrail/wizard/audittrail_view_log.py
@@ -42,17 +42,15 @@ class audittrail_view_log(osv.osv_memory):
         @param ids: List of audittrail view log’s IDs.
         @return: Dictionary of  audittrail log form on given date range.
         """
-        if not context:
-            context = {}
 
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
         result = mod_obj._get_id(cr, uid, 'audittrail', 'action_audittrail_log_tree')
-        id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        result = act_obj.read(cr, uid, [id])[0]
+        id = mod_obj.read(cr, uid, [result], ['res_id'], context=context)[0]['res_id']
+        result = act_obj.read(cr, uid, [id], context=context)[0]
 
         #start Loop
-        for datas in self.read(cr, uid, ids):
+        for datas in self.read(cr, uid, ids, context=context):
             if not datas.get('from', None):
                 if  datas.get('to') <> time.strftime("%Y-%m-%d %H:%M:%S"):
                     result['domain'] = str([('timestamp', '<', datas.get('to'))])
diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py
index 9a2d720cc1a..bf34c137b5a 100644
--- a/addons/base_action_rule/base_action_rule.py
+++ b/addons/base_action_rule/base_action_rule.py
@@ -35,7 +35,7 @@ class base_action_rule(osv.osv):
     _name = 'base.action.rule'
     _description = 'Action Rules'
     
-    def _state_get(self, cr, uid, context={}):
+    def _state_get(self, cr, uid, context=None):
         """ Get State
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -43,7 +43,7 @@ class base_action_rule(osv.osv):
             @param context: A standard dictionary for contextual values """
         return self.state_get(cr, uid, context=context)
 
-    def state_get(self, cr, uid, context={}):
+    def state_get(self, cr, uid, context=None):
         """ Get State
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -51,7 +51,7 @@ class base_action_rule(osv.osv):
             @param context: A standard dictionary for contextual values """
         return [('', '')]
   
-    def priority_get(self, cr, uid, context={}):
+    def priority_get(self, cr, uid, context=None):
         """ Get Priority
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -157,7 +157,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return True
 
     def _create(self, old_create, model, context=None):
-        if not context:
+        if context is None:
             context  = {}
         def make_call_old(cr, uid, vals, context=context):
             new_id = old_create(cr, uid, vals, context=context)
@@ -167,7 +167,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return make_call_old
     
     def _write(self, old_write, model, context=None):
-        if not context:
+        if context is None:
             context  = {}
         def make_call_old(cr, uid, ids, vals, context=context):
             if isinstance(ids, (str, int, long)):
@@ -178,7 +178,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         return make_call_old
 
     def _register_hook(self, cr, uid, ids, context=None):
-        if not context:
+        if context is None:
             context = {}
         for action_rule in self.browse(cr, uid, ids, context=context):
             model = action_rule.model_id.model
@@ -190,12 +190,12 @@ the rule to mark CC(mail to any other person defined in actions)."),
 
         return True
     def create(self, cr, uid, vals, context=None):
-        res_id = super(base_action_rule, self).create(cr, uid, vals, context)
+        res_id = super(base_action_rule, self).create(cr, uid, vals, context=context)
         self._register_hook(cr, uid, [res_id], context=context)        
         return res_id
     
     def write(self, cr, uid, ids, vals, context=None):
-        res = super(base_action_rule, self).write(cr, uid, ids, vals, context)
+        res = super(base_action_rule, self).write(cr, uid, ids, vals, context=context)
         self._register_hook(cr, uid, ids, context=context)
         return res
 
@@ -396,7 +396,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
         if not scrit:
             scrit = []
 
-        for action in self.browse(cr, uid, ids, context):
+        for action in self.browse(cr, uid, ids, context=context):
             model_obj = self.pool.get(action.model_id.model)
             for obj in objects:
                 ok = self.do_check(cr, uid, action, obj, context=context)
@@ -454,7 +454,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
 
         empty = orm.browse_null()
         rule_obj = self.pool.get('base.action.rule')
-        for rule in self.browse(cr, uid, ids):
+        for rule in self.browse(cr, uid, ids, context=context):
             if rule.act_mail_body:
                 try:
                     rule_obj.format_mail(empty, rule.act_mail_body)
diff --git a/addons/base_action_rule/i18n/base_action_rule.pot b/addons/base_action_rule/i18n/base_action_rule.pot
index 93906a8f9ae..b7a65cea8a2 100644
--- a/addons/base_action_rule/i18n/base_action_rule.pot
+++ b/addons/base_action_rule/i18n/base_action_rule.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:13+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:13+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:00+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_action_rule/i18n/pt.po b/addons/base_action_rule/i18n/pt.po
index 2418010012d..471f5b24e94 100644
--- a/addons/base_action_rule/i18n/pt.po
+++ b/addons/base_action_rule/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 13:02+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 20:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index c567105547d..fa85b242f6a 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -106,7 +106,6 @@ def _links_get(self, cr, uid, context=None):
     @param context: A standard dictionary for contextual values
     @return: list of dictionary which contain object and name and id.
     """
-
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
@@ -222,7 +221,7 @@ class calendar_attendee(osv.osv):
             name += ':'
         return (name or '') + (email and ('MAILTO:' + email) or '')
 
-    def _compute_data(self, cr, uid, ids, name, arg, context):
+    def _compute_data(self, cr, uid, ids, name, arg, context=None):
         """
         Compute data on function fields for attendee values .
         @param cr: the current row, from the database cursor,
@@ -300,7 +299,6 @@ class calendar_attendee(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: list of dictionary which contain object and name and id.
         """
-
         obj = self.pool.get('res.request.link')
         ids = obj.search(cr, uid, [])
         res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
@@ -649,7 +647,7 @@ true, it will allow you to hide the event alarm information without removing it.
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
 
         model_obj = self.pool.get(model)
-        for data in model_obj.browse(cr, uid, ids, context):
+        for data in model_obj.browse(cr, uid, ids, context=context):
 
             basic_alarm = data.alarm_id
             cal_alarm = data.base_calendar_alarm_id
@@ -719,7 +717,7 @@ true, it will allow you to hide the event alarm information without removing it.
         ir_obj = self.pool.get('ir.model')
         model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0]
         model_obj = self.pool.get(model)
-        for datas in model_obj.browse(cr, uid, ids, context):
+        for datas in model_obj.browse(cr, uid, ids, context=context):
             alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)])
             if alarm_ids:
                 alarm_obj.unlink(cr, uid, alarm_ids)
@@ -794,7 +792,7 @@ class calendar_alarm(osv.osv):
                 delta = timedelta(minutes=vals['trigger_duration'])
             trigger_date = dtstart + (vals['trigger_occurs'] == 'after' and delta or -delta)
             vals['trigger_date'] = trigger_date
-        res = super(calendar_alarm, self).create(cr, uid, vals, context)
+        res = super(calendar_alarm, self).create(cr, uid, vals, context=context)
         return res
 
     def do_run_scheduler(self, cr, uid, automatic=False, use_new_cursor=False, \
@@ -1685,7 +1683,7 @@ class calendar_todo(osv.osv):
     _inherit = "calendar.event"
     _description = "Calendar Task"
 
-    def _get_date(self, cr, uid, ids, name, arg, context):
+    def _get_date(self, cr, uid, ids, name, arg, context=None):
         """
         Get Date
         @param self: The object pointer
@@ -1701,7 +1699,7 @@ class calendar_todo(osv.osv):
             res[event.id] = event.date_start
         return res
 
-    def _set_date(self, cr, uid, id, name, value, arg, context):
+    def _set_date(self, cr, uid, id, name, value, arg, context=None):
         """
         Set Date
         @param self: The object pointer
diff --git a/addons/base_calendar/i18n/base_calendar.pot b/addons/base_calendar/i18n/base_calendar.pot
index 98453bc2cc3..219fbb8c42d 100644
--- a/addons/base_calendar/i18n/base_calendar.pot
+++ b/addons/base_calendar/i18n/base_calendar.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:14+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:14+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:02+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index ed34f854bec..2a2a82dd237 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 16:33+0000\n"
+"PO-Revision-Date: 2010-12-16 00:42+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -1068,7 +1068,7 @@ msgstr ""
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
 msgid "Calendar Edit all event"
-msgstr ""
+msgstr "Επεξεργασία όλων των συμβάντων του Ημερολογίου"
 
 #. module: base_calendar
 #: help:calendar.attendee,role:0
@@ -1078,7 +1078,7 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Αναφ Συμβάντος"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
@@ -1088,14 +1088,14 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Αναζήτηση Συμβάντων"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Weekly"
-msgstr ""
+msgstr "Εβδομαδιαία"
 
 #. module: base_calendar
 #: help:calendar.alarm,active:0
@@ -1106,6 +1106,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Εάν το ενεργό πεδίο είναι επιλεγμένο, σας επιτρέπει να κρύψεται την "
+"υπενθύμιση χωρίς να την απομακρύνεται."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
@@ -1116,7 +1118,7 @@ msgstr ""
 #. module: base_calendar
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "Δεν μπορεί να υπάρχουν δύο χρήστες με το ίδιο όνομα!"
 
 #. module: base_calendar
 #: field:calendar.alarm,state:0
@@ -1126,48 +1128,48 @@ msgstr ""
 #: field:calendar.event,state:0
 #: field:calendar.todo,state:0
 msgid "State"
-msgstr ""
+msgstr "Κατάσταση"
 
 #. module: base_calendar
 #: view:res.alarm:0
 msgid "Reminder Details"
-msgstr ""
+msgstr "Λεπτομέρειες Υπενθύμισης"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "Για Επισκόπηση"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
 #: field:calendar.event,freq:0
 #: field:calendar.todo,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Συχνότητα"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Done"
-msgstr ""
+msgstr "Ολοκληρώθηκε"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: field:base_calendar.invite.attendee,user_ids:0
 msgid "Users"
-msgstr ""
+msgstr "Χρήστες"
 
 #. module: base_calendar
 #: view:base.calendar.set.exrule:0
 #: view:calendar.event:0
 msgid "of"
-msgstr ""
+msgstr "από"
 
 #. module: base_calendar
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 #: view:calendar.event.edit.all:0
 msgid "Cancel"
-msgstr ""
+msgstr "Ακύρωση"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_res_users
@@ -1179,12 +1181,12 @@ msgstr ""
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Tuesday"
-msgstr ""
+msgstr "Τρίτη"
 
 #. module: base_calendar
 #: selection:calendar.alarm,action:0
 msgid "Procedure"
-msgstr ""
+msgstr "Διαδικασία"
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1197,7 +1199,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Responsible User"
-msgstr ""
+msgstr "Υπεύθυνος Χρήστης"
 
 #. module: base_calendar
 #: selection:calendar.attendee,availability:0
@@ -1205,12 +1207,12 @@ msgstr ""
 #: selection:calendar.todo,show_as:0
 #: selection:res.users,availability:0
 msgid "Busy"
-msgstr ""
+msgstr "Απασχολημένος/η"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event
 msgid "Calendar Event"
-msgstr ""
+msgstr "Συμβάν Ημερολογίου"
 
 #. module: base_calendar
 #: selection:calendar.attendee,state:0
@@ -1225,7 +1227,7 @@ msgstr ""
 #: field:calendar.event,user_id:0
 #: field:calendar.todo,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Υπεύθυνος"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1245,19 +1247,19 @@ msgstr ""
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Thursday"
-msgstr ""
+msgstr "Πέμπτη"
 
 #. module: base_calendar
 #: selection:calendar.event,rrule_type:0
 #: selection:calendar.todo,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Προσαρμοσμένος"
 
 #. module: base_calendar
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Κανόνας Εξαίρεσης"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
@@ -1268,7 +1270,7 @@ msgstr ""
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Details"
-msgstr ""
+msgstr "Λεπτομέρειες"
 
 #. module: base_calendar
 #: help:calendar.event,exrule:0
@@ -1283,12 +1285,12 @@ msgstr ""
 #: field:calendar.event,month_list:0
 #: field:calendar.todo,month_list:0
 msgid "Month"
-msgstr ""
+msgstr "Μήνας"
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
 msgid "External Email"
-msgstr ""
+msgstr "Εξωτερικό Email"
 
 #. module: base_calendar
 #: help:calendar.event,rrule:0
@@ -1312,36 +1314,36 @@ msgstr ""
 #: field:calendar.todo,description:0
 #: field:calendar.todo,name:0
 msgid "Description"
-msgstr ""
+msgstr "Περιγραφή"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
 #: selection:calendar.event,month_list:0
 #: selection:calendar.todo,month_list:0
 msgid "May"
-msgstr ""
+msgstr "Μάιος"
 
 #. module: base_calendar
 #: field:base_calendar.invite.attendee,type:0
 #: view:calendar.attendee:0
 msgid "Type"
-msgstr ""
+msgstr "Τύπος"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Search Invitations"
-msgstr ""
+msgstr "Αναζήτηση Προσκλήσεων"
 
 #. module: base_calendar
 #: selection:calendar.alarm,trigger_occurs:0
 #: selection:res.alarm,trigger_occurs:0
 msgid "After"
-msgstr ""
+msgstr "Μετά"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
 msgid "Stop"
-msgstr ""
+msgstr "Διακοπή"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_values
@@ -1352,12 +1354,12 @@ msgstr ""
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Κάλεσε Κόσμο"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
 msgid "Objects"
-msgstr ""
+msgstr "Αντικείμενα"
 
 #. module: base_calendar
 #: view:calendar.attendee:0
diff --git a/addons/base_calendar/i18n/fr.po b/addons/base_calendar/i18n/fr.po
index 795e0c2c99f..d2c15feeb86 100644
--- a/addons/base_calendar/i18n/fr.po
+++ b/addons/base_calendar/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-03 08:56+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-16 03:31+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
@@ -209,7 +210,7 @@ msgstr "Mer"
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Show time as"
-msgstr ""
+msgstr "Afficher l'heure comme"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,tu:0
@@ -333,7 +334,7 @@ msgstr "Groupé par..."
 #. module: base_calendar
 #: help:base_calendar.invite.attendee,email:0
 msgid "Provide external email address who will receive this invitation."
-msgstr ""
+msgstr "Indiquez le courriel de la personne qui doit recevoir l'invitation"
 
 #. module: base_calendar
 #: help:calendar.attendee,partner_id:0
@@ -360,7 +361,7 @@ msgstr "Date de fin d'évènement"
 #. module: base_calendar
 #: selection:calendar.attendee,role:0
 msgid "Optional Participation"
-msgstr "Participation Optionnellle"
+msgstr "Participation facultative"
 
 #. module: base_calendar
 #: help:calendar.event,interval:0
@@ -388,7 +389,7 @@ msgstr "_Annuler"
 #. module: base_calendar
 #: model:ir.module.module,shortdesc:base_calendar.module_meta_information
 msgid "Basic Calendar Functionality"
-msgstr "Fonction d'agenda basique"
+msgstr "Fonction d'agenda de base"
 
 #. module: base_calendar
 #: field:calendar.event,organizer:0
@@ -590,7 +591,7 @@ msgstr "Créé"
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
 msgid "Set Exclude range"
-msgstr ""
+msgstr "Définir une plage exclue"
 
 #. module: base_calendar
 #: selection:calendar.event,class:0
@@ -807,7 +808,7 @@ msgstr "Emplacement de l'événement"
 #: field:calendar.event,rrule:0
 #: field:calendar.todo,rrule:0
 msgid "Recurrent Rule"
-msgstr "Règle récurrente"
+msgstr "Règle de récurrence"
 
 #. module: base_calendar
 #: selection:calendar.alarm,state:0
@@ -822,7 +823,7 @@ msgstr "Pièce jointe"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "Invitation From"
-msgstr ""
+msgstr "Invitation de"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -834,7 +835,7 @@ msgstr "Rappel"
 #: view:base.calendar.set.exrule:0
 #: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
 msgid "Set Exrule"
-msgstr ""
+msgstr "Appliquer la règle d'exception"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -866,6 +867,7 @@ msgid ""
 "Reference to the URIthat points to the directory information corresponding "
 "to the attendee."
 msgstr ""
+"Référence à l'URI de la fiche du participant dans le carnet d'adresses."
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,month_list:0
@@ -1058,6 +1060,8 @@ msgid ""
 "Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
 "other"
 msgstr ""
+"\"Durée\" et \"répétition\" sont tous les deux facultatifs, mais si l'un est "
+"indiqué, l'autre doit l'être également."
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_event_edit_all
@@ -1072,17 +1076,17 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.attendee,ref:0
 msgid "Event Ref"
-msgstr ""
+msgstr "Réf. de l'événement"
 
 #. module: base_calendar
 #: help:calendar.alarm,action:0
 msgid "Defines the action to be invoked when an alarm is triggered"
-msgstr ""
+msgstr "Défini l'action à exécuter lorsque l'alarme se déclenche"
 
 #. module: base_calendar
 #: view:calendar.event:0
 msgid "Search Events"
-msgstr ""
+msgstr "Chercher des événements"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,freq:0
@@ -1100,12 +1104,14 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Si le champ actif est à \"Vrai\", cela vous permettra de cacher les alarmes "
+"sans les supprimer."
 
 #. module: base_calendar
 #: field:calendar.event,recurrent_id:0
 #: field:calendar.todo,recurrent_id:0
 msgid "Recurrent ID date"
-msgstr ""
+msgstr "Id. de la date récurrente"
 
 #. module: base_calendar
 #: sql_constraint:res.users:0
@@ -1130,7 +1136,7 @@ msgstr "Détails du rappel"
 #. module: base_calendar
 #: view:calendar.attendee:0
 msgid "To Review"
-msgstr ""
+msgstr "À vérifier"
 
 #. module: base_calendar
 #: field:base.calendar.set.exrule,freq:0
@@ -1187,6 +1193,8 @@ msgid ""
 "calendar component, than that                             provided by the "
 "\"SUMMARY\" property"
 msgstr ""
+"Fournit une description plus complète du composant agenda, que celle fournit "
+"par la propriété \"RÉSUMÉ\""
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -1251,7 +1259,7 @@ msgstr "Personnalisé"
 #: field:calendar.event,exrule:0
 #: field:calendar.todo,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Règle en exception"
 
 #. module: base_calendar
 #: help:calendar.attendee,language:0
@@ -1350,7 +1358,7 @@ msgstr ""
 #: view:base_calendar.invite.attendee:0
 #: view:calendar.event:0
 msgid "Invite People"
-msgstr ""
+msgstr "Inviter les personnes"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_model
@@ -1428,7 +1436,7 @@ msgstr "Nom"
 #: field:calendar.event,exdate:0
 #: field:calendar.todo,exdate:0
 msgid "Exception Date/Times"
-msgstr ""
+msgstr "Date/heure en exception"
 
 #. module: base_calendar
 #: help:calendar.alarm,name:0
@@ -1507,7 +1515,7 @@ msgstr "Inviter"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Information sur le participant"
 
 #. module: base_calendar
 #: field:calendar.alarm,res_id:0
@@ -1535,6 +1543,7 @@ msgstr "Séquence"
 #: help:calendar.todo,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
 msgstr ""
+"Déclenche une alarme à cette heure, avant que l'événement n'ait lieu."
 
 #. module: base_calendar
 #: selection:base_calendar.invite.attendee,type:0
@@ -1563,7 +1572,7 @@ msgstr ""
 #: field:calendar.attendee,availability:0
 #: field:res.users,availability:0
 msgid "Free/Busy"
-msgstr ""
+msgstr "Libre/Occupé"
 
 #. module: base_calendar
 #: field:calendar.alarm,duration:0
@@ -1574,7 +1583,7 @@ msgstr ""
 #: field:res.alarm,duration:0
 #: field:res.alarm,trigger_duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durée"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
@@ -1586,14 +1595,14 @@ msgstr ""
 #. module: base_calendar
 #: field:calendar.alarm,trigger_date:0
 msgid "Trigger Date"
-msgstr ""
+msgstr "Date de déclenchement"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,week_list:0
 #: selection:calendar.event,week_list:0
 #: selection:calendar.todo,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Samedi"
 
 #. module: base_calendar
 #: selection:base.calendar.set.exrule,byday:0
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index a18388f5b3c..48f39e609f9 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -62,7 +62,7 @@ send an Email to Invited Person')
         @return: Dictionary of {}.
         """
 
-        if not context:
+        if context is None:
             context = {}
 
         model = False
@@ -74,7 +74,7 @@ send an Email to Invited Person')
 
         model_field = context.get('attendee_field', False)
         obj = self.pool.get(model)
-        res_obj = obj.browse(cr, uid, context_id)
+        res_obj = obj.browse(cr, uid, context_id, context=context)
         att_obj = self.pool.get('calendar.attendee')
         user_obj = self.pool.get('res.users')
         current_user = user_obj.browse(cr, uid, uid, context=context)
diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py
index 995d2a98dcc..4f5d57235e5 100644
--- a/addons/base_calendar/wizard/base_calendar_set_exrule.py
+++ b/addons/base_calendar/wizard/base_calendar_set_exrule.py
@@ -82,8 +82,10 @@ class base_calendar_set_exrule(osv.osv_memory):
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
         """
+        if context is None: 
+            context = {}
         event_obj = self.pool.get(context.get('active_model'))
-        for event in event_obj.browse(cr, uid, context.get('active_ids', [])):
+        for event in event_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if not event.rrule:
                 raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency before applying Exception Rule."))
         return False
@@ -102,7 +104,9 @@ class base_calendar_set_exrule(osv.osv_memory):
         weekstring = ''
         monthstring = ''
         yearstring = ''
-        ex_id = base_calendar.base_calendar_id2real_id(context['active_id'])
+        if context is None: 
+            context = {}
+        ex_id = base_calendar.base_calendar_id2real_id(context.get('active_id', False))
         model = context.get('model', False)
         model_obj = self.pool.get(model)
         for datas in self.read(cr, uid, ids, context=context):
diff --git a/addons/base_calendar/wizard/calendar_event_edit_all.py b/addons/base_calendar/wizard/calendar_event_edit_all.py
index d17195f9a27..a9b0a9f347e 100644
--- a/addons/base_calendar/wizard/calendar_event_edit_all.py
+++ b/addons/base_calendar/wizard/calendar_event_edit_all.py
@@ -24,7 +24,7 @@ from osv import fields
 
 class calendar_event_edit_all(osv.osv_memory):
 
-    def _default_values(self, cr, uid, context={}):
+    def _default_values(self, cr, uid, context=None):
         """ Get Default value for Start Date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -42,7 +42,7 @@ class calendar_event_edit_all(osv.osv_memory):
                 event = model_obj.read(cr, uid, context_id, ['name', 'location', 'alarm_id'])
                 return event['date']
 
-    def _default_deadline(self, cr, uid, context={}):
+    def _default_deadline(self, cr, uid, context=None):
         """ Get Default value for End Date
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -69,7 +69,7 @@ class calendar_event_edit_all(osv.osv_memory):
         @param ids: List of calendar event edit all’s IDs
         @return: dictionary {}
         """
-        if not context:
+        if context is None:
             context = {}
 
         context_id = context and context.get('active_id', False) or False
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index 0147d147134..8a003ec7cf1 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -42,7 +42,7 @@ class res_partner_contact(osv.osv):
         all_job_ids = res_partner_job_obj.search(cr, uid, [])
         all_job_names = dict(zip(all_job_ids, res_partner_job_obj.name_get(cr, uid, all_job_ids, context=context)))
 
-        for contact in self.browse(cr, uid, ids, context):
+        for contact in self.browse(cr, uid, ids, context=context):
             if contact.job_ids:
                 res[contact.id] = all_job_names.get(contact.job_ids[0].id, False)
 
@@ -77,7 +77,7 @@ class res_partner_contact(osv.osv):
 
     _order = "name,first_name"
 
-    def name_get(self, cr, user, ids, context={}):
+    def name_get(self, cr, user, ids, context=None):
 
         """ will return name and first_name.......
             @param self: The object pointer
@@ -119,7 +119,7 @@ res_partner_contact()
 class res_partner_address(osv.osv):
 
     #overriding of the name_get defined in base in order to remove the old contact name
-    def name_get(self, cr, user, ids, context={}):
+    def name_get(self, cr, user, ids, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -131,6 +131,8 @@ class res_partner_address(osv.osv):
         if not len(ids):
             return []
         res = []
+        if context is None: 
+            context = {}
         for r in self.read(cr, user, ids, ['zip', 'city', 'partner_id', 'street']):
             if context.get('contact_display', 'contact')=='partner' and r['partner_id']:
                 res.append((r['id'], r['partner_id'][1]))
@@ -168,7 +170,7 @@ class res_partner_job(osv.osv):
             return []
         res = []
 
-        jobs = self.browse(cr, uid, ids)
+        jobs = self.browse(cr, uid, ids, context=context)
 
         contact_ids = [rec.contact_id.id for rec in jobs]
         contact_names = dict(self.pool.get('res.partner.contact').name_get(cr, uid, contact_ids, context=context))
@@ -238,7 +240,7 @@ class res_partner_job(osv.osv):
         partner_id = False
         if address_id:
             address = self.pool.get('res.partner.address')\
-                        .browse(cr, uid, address_id, context)
+                        .browse(cr, uid, address_id, context=context)
             partner_id = address.partner_id.id
         return {'value': {'name': partner_id}}
     
diff --git a/addons/base_contact/base_contact_installer.py b/addons/base_contact/base_contact_installer.py
index 4f4e2b2896c..6d979da7a02 100644
--- a/addons/base_contact/base_contact_installer.py
+++ b/addons/base_contact/base_contact_installer.py
@@ -35,7 +35,7 @@ class base_contact_installer(osv.osv_memory):
         """
         This function is used to create contact and address from existing partner address
         """
-        obj = self.pool.get("base.contact.installer").browse(cr, uid, uid)
+        obj = self.pool.get("base.contact.installer").browse(cr, uid, uid, context=context)
         if obj.migrate:
             cr.execute("""DROP TRIGGER  IF EXISTS contactjob on res_partner_contact;
                             DROP LANGUAGE  IF EXISTS  plpgsql CASCADE;
diff --git a/addons/base_contact/i18n/base_contact.pot b/addons/base_contact/i18n/base_contact.pot
index 61a3b0131a8..07ed51bcf0e 100644
--- a/addons/base_contact/i18n/base_contact.pot
+++ b/addons/base_contact/i18n/base_contact.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:15+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:15+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:02+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,13 +16,221 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: base_contact
-#: field:res.partner.job,sequence_contact:0
-msgid "Contact Seq."
+#: field:res.partner.contact,title:0
+msgid "Title"
 msgstr ""
 
 #. module: base_contact
-#: help:base.contact.installer,migrate:0
-msgid "If you select this, all addresses will be migrated."
+#: view:res.partner.address:0
+msgid "# of Contacts"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "title"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_start:0
+msgid "Start date of job(Joining Date)"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Select the Option for Addresses Migration"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,function:0
+msgid "Function of this contact with this partner"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,state:0
+msgid "Status of Address"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,name:0
+msgid "You may                     enter Address first,Partner will be linked automatically if any."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,fax:0
+msgid "Job FAX no."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,comment:0
+msgid "Notes"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_contacts0
+msgid "People you work with."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
+msgid "Define functions and address."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,date_stop:0
+msgid "Last date of job"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+#: field:base.contact.installer,migrate:0
+msgid "Migrate"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.job,name:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_function0
+msgid "Jobs at a same partner address."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,name:base_contact.process_node_partners0
+msgid "Partners"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.contact,active:0
+msgid "If the active field is set to False,                 it will allow you to hide the partner contact without removing it."
+msgstr ""
+
+#. module: base_contact
+#: model:ir.module.module,shortdesc:base_contact.module_meta_information
+#: model:process.process,name:base_contact.process_process_basecontactprocess0
+msgid "Base Contact"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,date_stop:0
+msgid "Date Stop"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
+msgid "Contact's Jobs"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Categories"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,sequence_partner:0
+msgid "Order of importance                 of this job title in the list of job title of the linked partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,phone:0
+msgid "Job Phone no."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+#: field:res.partner.contact,job_ids:0
+msgid "Functions and Addresses"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_contact
+#: field:res.partner.job,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,email:0
+msgid "Job E-Mail"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_partner:0
+msgid "Partner Seq."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
+msgid "Function to address"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,name:0
+msgid "Last Name"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+#: view:res.partner.contact:0
+msgid "Communication"
+msgstr ""
+
+#. module: base_contact
+#: field:base.contact.installer,config_logo:0
+#: field:res.partner.contact,photo:0
+msgid "Image"
+msgstr ""
+
+#. module: base_contact
+#: selection:res.partner.job,state:0
+msgid "Past"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_res_partner_address
+msgid "Partner Addresses"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Address's Migration to Contacts"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,sequence_contact:0
+msgid "Contact Seq."
 msgstr ""
 
 #. module: base_contact
@@ -41,8 +249,129 @@ msgid "Contacts"
 msgstr ""
 
 #. module: base_contact
-#: field:res.partner.job,sequence_partner:0
-msgid "Partner Seq."
+#: view:base.contact.installer:0
+msgid "Due to changes in Address and Partner's relation, some of the details from address are needed to be migrated into contact information."
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_addresses0
+msgid "Working and private addresses."
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,address_id:0
+msgid "Address which is linked to the Partner"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,function:0
+msgid "Partner Function"
+msgstr ""
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,website:0
+msgid "Website"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Otherwise these details will not be visible from address/contact."
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,email:0
+#: field:res.partner.job,email:0
+msgid "E-Mail"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.model,name:base_contact.model_base_contact_installer
+msgid "base.contact.installer"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.job:0
+msgid "Contact Functions"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.job,phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "Do you want to migrate your Address data in Contact Data?"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,function:0
+msgid "Main Function"
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
+msgid "Define partners and their addresses."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Seq."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,lang_id:0
+msgid "Language"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Extra Information"
+msgstr ""
+
+#. module: base_contact
+#: model:process.node,note:base_contact.process_node_partners0
+msgid "Companies you work with."
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "General"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner.contact:0
+msgid "Photo"
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,birthdate:0
+msgid "Birth Date"
+msgstr ""
+
+#. module: base_contact
+#: help:base.contact.installer,migrate:0
+msgid "If you select this, all addresses will be migrated."
 msgstr ""
 
 #. module: base_contact
@@ -65,276 +394,36 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#. module: base_contact
-#: help:res.partner.job,state:0
-msgid "Status of Address"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_contacttofunction0
-msgid "Contact to function"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,function:0
-msgid "Partner Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
-msgid "Partner to address"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.address:0
-msgid "# of Contacts"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.contact,active:0
-msgid "If the active field is set to False,                 it will allow you to hide the partner contact without removing it."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Seq."
-msgstr ""
-
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
 msgstr ""
 
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr ""
-
-#. module: base_contact
-#: field:base.contact.installer,progress:0
-msgid "Configuration Progress"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,phone:0
-msgid "Phone"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_contacttofunction0
-msgid "Defines contacts and functions."
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_base_contact_installer
-msgid "base.contact.installer"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,title:0
-msgid "Title"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,function:0
-msgid "Function of this contact with this partner"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.job:0
-msgid "Contact Functions"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.module.module,shortdesc:base_contact.module_meta_information
-#: model:process.process,name:base_contact.process_process_basecontactprocess0
-msgid "Base Contact"
-msgstr ""
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Due to changes in Address and Partner's relation, some of the details from address are needed to be migrated into contact information."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,email:0
-#: field:res.partner.job,email:0
-msgid "E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,name:base_contact.process_node_partners0
-msgid "Partners"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,date_stop:0
-msgid "Date Stop"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: field:res.partner.job,address_id:0
-msgid "Address"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_res_partner_job
-msgid "Contact's Jobs"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,country_id:0
-msgid "Nationality"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-msgid "Postal Address"
-msgstr ""
-
 #. module: base_contact
 #: field:res.partner.address,job_id:0
 #: field:res.partner.contact,job_id:0
 msgid "Main Job"
 msgstr ""
 
+#. module: base_contact
+#: model:process.transition,note:base_contact.process_transition_contacttofunction0
+msgid "Defines contacts and functions."
+msgstr ""
+
+#. module: base_contact
+#: model:process.transition,name:base_contact.process_transition_contacttofunction0
+msgid "Contact to function"
+msgstr ""
+
 #. module: base_contact
 #: view:res.partner:0
-msgid "Categories"
+#: field:res.partner.job,address_id:0
+msgid "Address"
 msgstr ""
 
 #. module: base_contact
-#: help:res.partner.job,name:0
-msgid "You may                     enter Address first,Partner will be linked automatically if any."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,function:0
-msgid "Main Function"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_partnertoaddress0
-msgid "Define partners and their addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:base.contact.installer,name:0
-msgid "Name"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,mobile:0
-msgid "Mobile"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_contacts0
-msgid "People you work with."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,comment:0
-msgid "Notes"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,sequence_partner:0
-msgid "Order of importance                 of this job title in the list of job title of the linked partner"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Extra Information"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.contact,job_ids:0
-msgid "Functions and Addresses"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,active:0
-msgid "Active"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,phone:0
-msgid "Job Phone no."
-msgstr ""
-
-#. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_contact
-#: field:res.partner.job,contact_id:0
-msgid "Contact"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,lang_id:0
-msgid "Language"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_partners0
-msgid "Companies you work with."
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,email:0
-msgid "Job E-Mail"
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,partner_id:0
-msgid "Main Employer"
-msgstr ""
-
-#. module: base_contact
-#: model:process.transition,name:base_contact.process_transition_functiontoaddress0
-msgid "Function to address"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,date_stop:0
-msgid "Last date of job"
-msgstr ""
-
-#. module: base_contact
-#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
-msgid "Address Migration"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Partner Contact"
+#: field:res.partner.contact,country_id:0
+msgid "Nationality"
 msgstr ""
 
 #. module: base_contact
@@ -343,8 +432,28 @@ msgid "Open Jobs"
 msgstr ""
 
 #. module: base_contact
-#: model:ir.model,name:base_contact.model_res_partner_address
-msgid "Partner Addresses"
+#: field:base.contact.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_contact
+#: view:base.contact.installer:0
+msgid "You can migrate Partner's current addresses to the contact."
+msgstr ""
+
+#. module: base_contact
+#: field:res.partner.contact,partner_id:0
+msgid "Main Employer"
+msgstr ""
+
+#. module: base_contact
+#: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
+msgid "Address Migration"
+msgstr ""
+
+#. module: base_contact
+#: view:res.partner:0
+msgid "Postal Address"
 msgstr ""
 
 #. module: base_contact
@@ -354,82 +463,8 @@ msgid "Addresses"
 msgstr ""
 
 #. module: base_contact
-#: field:res.partner.job,state:0
-msgid "State"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_addresses0
-msgid "Working and private addresses."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,name:0
-msgid "Last Name"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner:0
-#: view:res.partner.contact:0
-msgid "Communication"
-msgstr ""
-
-#. module: base_contact
-#: field:base.contact.installer,config_logo:0
-#: field:res.partner.contact,photo:0
-msgid "Image"
-msgstr ""
-
-#. module: base_contact
-#: view:base.contact.installer:0
-msgid "title"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,date_start:0
-msgid "Start date of job(Joining Date)"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,address_id:0
-msgid "Address which is linked to the Partner"
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "General"
-msgstr ""
-
-#. module: base_contact
-#: selection:res.partner.job,state:0
-msgid "Past"
-msgstr ""
-
-#. module: base_contact
-#: view:base.contact.installer:0
-#: field:base.contact.installer,migrate:0
-msgid "Migrate"
-msgstr ""
-
-#. module: base_contact
-#: help:res.partner.job,fax:0
-msgid "Job FAX no."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-msgid "Photo"
-msgstr ""
-
-#. module: base_contact
-#: model:process.node,note:base_contact.process_node_function0
-msgid "Jobs at a same partner address."
-msgstr ""
-
-#. module: base_contact
-#: view:res.partner.contact:0
-#: field:res.partner.job,name:0
-msgid "Partner"
+#: model:process.transition,name:base_contact.process_transition_partnertoaddress0
+msgid "Partner to address"
 msgstr ""
 
 #. module: base_contact
@@ -437,23 +472,8 @@ msgstr ""
 msgid "Date Start"
 msgstr ""
 
-#. module: base_contact
-#: model:process.transition,note:base_contact.process_transition_functiontoaddress0
-msgid "Define functions and address."
-msgstr ""
-
-#. module: base_contact
-#: field:res.partner.contact,website:0
-msgid "Website"
-msgstr ""
-
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
 msgid "Order of                     importance of this address in the list of addresses of the linked contact"
 msgstr ""
 
-#. module: base_contact
-#: field:res.partner.contact,birthdate:0
-msgid "Birth Date"
-msgstr ""
-
diff --git a/addons/base_contact/i18n/el.po b/addons/base_contact/i18n/el.po
index 83624faa5b4..4946b2f7b5c 100644
--- a/addons/base_contact/i18n/el.po
+++ b/addons/base_contact/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 12:13+0000\n"
+"PO-Revision-Date: 2010-12-15 05:05+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_contact/i18n/fr.po b/addons/base_contact/i18n/fr.po
index 8e49440cbc4..16aa49da8af 100644
--- a/addons/base_contact/i18n/fr.po
+++ b/addons/base_contact/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-09 11:40+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-16 03:21+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -24,7 +25,7 @@ msgstr "Séq. du contact"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "Si vous sélectionnez ceci, toutes les adresses seront migrées."
 
 #. module: base_contact
 #: view:res.partner.address:0
@@ -102,6 +103,8 @@ msgid ""
 "If the active field is set to False,                 it will allow you to "
 "hide the partner contact without removing it."
 msgstr ""
+"Si le champ actif est à \"Faux\", cela vous permettra de cacher le contact "
+"du partenaire sans le supprimer."
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -116,7 +119,7 @@ msgstr "Fonction"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Otherwise these details will not be visible from address/contact."
-msgstr ""
+msgstr "Sinon, ces détails ne seront pas visibles dans l'adresse/le contact."
 
 #. module: base_contact
 #: field:res.partner.job,fax:0
@@ -170,6 +173,9 @@ msgid ""
 "Due to changes in Address and Partner's relation, some of the details from "
 "address are needed to be migrated into contact information."
 msgstr ""
+"En raison de modifications dans la relation entre le partenaire et les "
+"adresses, certains détails des adresses doivent migrer dans les informations "
+"de contact."
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -181,6 +187,8 @@ msgstr "E-Mail"
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
 msgstr ""
+"Voulez-vous faire migrer les données des adresses dans les données des "
+"contacts ?"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
@@ -230,6 +238,8 @@ msgid ""
 "You may                     enter Address first,Partner will be linked "
 "automatically if any."
 msgstr ""
+"Vous pouvez entrer l'adresse en premier : le partenaire sera lié "
+"automatiquement s'il existe."
 
 #. module: base_contact
 #: field:res.partner.contact,function:0
@@ -278,6 +288,8 @@ msgid ""
 "Order of importance                 of this job title in the list of job "
 "title of the linked partner"
 msgstr ""
+"Ordre d'importance de cette fonction dans la liste des fonctions du "
+"partenaire lié"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -319,7 +331,7 @@ msgstr "Entreprises avec lesquelles vous travaillez"
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Courriel professionnel"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -349,7 +361,7 @@ msgstr "Contact du partenaire"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Postes à pourvoir"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
@@ -418,7 +430,7 @@ msgstr "Précédente"
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Migrer"
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
@@ -462,6 +474,7 @@ msgid ""
 "Order of                     importance of this address in the list of "
 "addresses of the linked contact"
 msgstr ""
+"Ordre d'importance de cette adresse dans le carnet d'adresses du contact lié"
 
 #. module: base_contact
 #: field:res.partner.contact,birthdate:0
diff --git a/addons/base_contact/i18n/pt.po b/addons/base_contact/i18n/pt.po
index ee264c4e791..b907df0fd57 100644
--- a/addons/base_contact/i18n/pt.po
+++ b/addons/base_contact/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
diff --git a/addons/base_contact/i18n/sl.po b/addons/base_contact/i18n/sl.po
index ae183a4c221..1660e4aeba7 100644
--- a/addons/base_contact/i18n/sl.po
+++ b/addons/base_contact/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-03 01:39+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 11:30+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_contact
@@ -24,12 +24,12 @@ msgstr "Zap. kontaktov"
 #. module: base_contact
 #: help:base.contact.installer,migrate:0
 msgid "If you select this, all addresses will be migrated."
-msgstr ""
+msgstr "Če izberete to možnost, bodo prenešeni vsi naslovi"
 
 #. module: base_contact
 #: view:res.partner.address:0
 msgid "Search Contact"
-msgstr ""
+msgstr "Išči po stikih"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_partner_contact_form
@@ -69,7 +69,7 @@ msgstr "Drugo"
 #. module: base_contact
 #: help:res.partner.job,state:0
 msgid "Status of Address"
-msgstr ""
+msgstr "Status naslova"
 
 #. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
@@ -126,7 +126,7 @@ msgstr "Faks"
 #. module: base_contact
 #: field:base.contact.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Potek konfiguracije"
 
 #. module: base_contact
 #: field:res.partner.job,phone:0
@@ -141,7 +141,7 @@ msgstr "Določa stike in funkcije"
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_base_contact_installer
 msgid "base.contact.installer"
-msgstr ""
+msgstr "base.contact.installer"
 
 #. module: base_contact
 #: field:res.partner.contact,title:0
@@ -180,7 +180,7 @@ msgstr "E-pošta"
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "Do you want to migrate your Address data in Contact Data?"
-msgstr ""
+msgstr "Ali želite prenesti podatke o vaših naslovih v podatke o stiku?"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_partners0
@@ -211,7 +211,7 @@ msgstr "Državljanstvo"
 #. module: base_contact
 #: view:res.partner:0
 msgid "Postal Address"
-msgstr ""
+msgstr "Poštni naslov"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
@@ -244,7 +244,7 @@ msgstr "Določi partnerje in njihove naslove"
 #. module: base_contact
 #: field:base.contact.installer,name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: base_contact
 #: field:res.partner.job,extension:0
@@ -265,7 +265,7 @@ msgstr "S kareimi ljudmi poslujete"
 #: view:res.partner.contact:0
 #: field:res.partner.contact,comment:0
 msgid "Notes"
-msgstr ""
+msgstr "Opombe"
 
 #. module: base_contact
 #: help:res.partner.job,extension:0
@@ -298,7 +298,7 @@ msgstr "Aktivno"
 #. module: base_contact
 #: help:res.partner.job,phone:0
 msgid "Job Phone no."
-msgstr ""
+msgstr "Službena telefonska številka"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_contact
@@ -319,7 +319,7 @@ msgstr "Podjetja s katerimi delate."
 #. module: base_contact
 #: help:res.partner.job,email:0
 msgid "Job E-Mail"
-msgstr ""
+msgstr "Službeni e-poštni naslov"
 
 #. module: base_contact
 #: field:res.partner.contact,partner_id:0
@@ -334,12 +334,12 @@ msgstr "Nasloviti funkcijo"
 #. module: base_contact
 #: help:res.partner.job,date_stop:0
 msgid "Last date of job"
-msgstr ""
+msgstr "Konec zaposlitve"
 
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.action_base_contact_installer
 msgid "Address Migration"
-msgstr ""
+msgstr "Prenos naslova"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -349,12 +349,12 @@ msgstr "Stik partnerja"
 #. module: base_contact
 #: model:ir.actions.act_window,name:base_contact.act_res_partner_jobs
 msgid "Open Jobs"
-msgstr ""
+msgstr "Odprte zaposlitve"
 
 #. module: base_contact
 #: model:ir.model,name:base_contact.model_res_partner_address
 msgid "Partner Addresses"
-msgstr ""
+msgstr "Naslovi stranke"
 
 #. module: base_contact
 #: model:process.node,name:base_contact.process_node_addresses0
@@ -381,28 +381,28 @@ msgstr "Priimek"
 #: view:res.partner:0
 #: view:res.partner.contact:0
 msgid "Communication"
-msgstr ""
+msgstr "Sporočanje"
 
 #. module: base_contact
 #: field:base.contact.installer,config_logo:0
 #: field:res.partner.contact,photo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: base_contact
 #: view:base.contact.installer:0
 msgid "title"
-msgstr ""
+msgstr "naslov"
 
 #. module: base_contact
 #: help:res.partner.job,date_start:0
 msgid "Start date of job(Joining Date)"
-msgstr ""
+msgstr "Začetek zaposlitve"
 
 #. module: base_contact
 #: help:res.partner.job,address_id:0
 msgid "Address which is linked to the Partner"
-msgstr ""
+msgstr "Naslov, ki je povezan s stranko"
 
 #. module: base_contact
 #: view:res.partner.contact:0
@@ -418,17 +418,17 @@ msgstr "Pretekli"
 #: view:base.contact.installer:0
 #: field:base.contact.installer,migrate:0
 msgid "Migrate"
-msgstr ""
+msgstr "Preseli"
 
 #. module: base_contact
 #: help:res.partner.job,fax:0
 msgid "Job FAX no."
-msgstr ""
+msgstr "Številka službenega faks-a:"
 
 #. module: base_contact
 #: view:res.partner.contact:0
 msgid "Photo"
-msgstr ""
+msgstr "Fotografija"
 
 #. module: base_contact
 #: model:process.node,note:base_contact.process_node_function0
diff --git a/addons/base_iban/base_iban.py b/addons/base_iban/base_iban.py
index b632e5f3e47..6f633c7b474 100644
--- a/addons/base_iban/base_iban.py
+++ b/addons/base_iban/base_iban.py
@@ -73,23 +73,23 @@ def _format_iban(string):
 class res_partner_bank(osv.osv):
     _inherit = "res.partner.bank"
 
-    def create(self, cr, uid, vals, context={}):
+    def create(self, cr, uid, vals, context=None):
         #overwrite to format the iban number correctly
         if 'iban' in vals and vals['iban']:
             vals['iban'] = _format_iban(vals['iban'])
         return super(res_partner_bank, self).create(cr, uid, vals, context)
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         #overwrite to format the iban number correctly
         if 'iban' in vals and vals['iban']:
             vals['iban'] = _format_iban(vals['iban'])
         return super(res_partner_bank, self).write(cr, uid, ids, vals, context)
 
-    def check_iban(self, cr, uid, ids):
+    def check_iban(self, cr, uid, ids, context=None):
         '''
         Check the IBAN number
         '''
-        for bank_acc in self.browse(cr, uid, ids):
+        for bank_acc in self.browse(cr, uid, ids, context=context):
             if not bank_acc.iban:
                 continue
             iban = _format_iban(bank_acc.iban).lower()
@@ -109,7 +109,7 @@ class res_partner_bank(osv.osv):
                 return False
         return True
 
-    def _construct_constraint_msg(self, cr, uid, ids):
+    def _construct_constraint_msg(self, cr, uid, ids, context=None):
 
         def default_iban_check(iban_cn):
             return iban_cn[0] in string.ascii_lowercase and iban_cn[1] in string.ascii_lowercase
@@ -123,12 +123,12 @@ class res_partner_bank(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         res = []
         to_check_ids = []
-        for id in self.browse(cr, uid, ids):
+        for id in self.browse(cr, uid, ids, context=context):
             if id.state=='iban':
                 res.append((id.id,id.iban))
             else:
                 to_check_ids.append(id.id)
-        res += super(res_partner_bank, self).name_get(cr, uid, to_check_ids, context)
+        res += super(res_partner_bank, self).name_get(cr, uid, to_check_ids, context=context)
         return res
 
     def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
@@ -158,7 +158,7 @@ class res_partner_bank(osv.osv):
             'ch': lambda x: x[9:],
             'gb': lambda x: x[14:],
         }
-        for record in self.browse(cr, uid, ids, context):
+        for record in self.browse(cr, uid, ids, context=context):
             if not record.iban:
                 res[record.id] = False
                 continue
diff --git a/addons/base_iban/i18n/base_iban.pot b/addons/base_iban/i18n/base_iban.pot
index 58900429ca1..c6ac6a13e2c 100644
--- a/addons/base_iban/i18n/base_iban.pot
+++ b/addons/base_iban/i18n/base_iban.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:15:11+0000\n"
-"PO-Revision-Date: 2010-12-10 17:15:11+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_iban/i18n/pt.po b/addons/base_iban/i18n/pt.po
index c61f57a2d90..44ff1a22c66 100644
--- a/addons/base_iban/i18n/pt.po
+++ b/addons/base_iban/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
diff --git a/addons/base_iban/i18n/sl.po b/addons/base_iban/i18n/sl.po
index 66deb89312b..d21c22fa9ac 100644
--- a/addons/base_iban/i18n/sl.po
+++ b/addons/base_iban/i18n/sl.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:15+0000\n"
-"PO-Revision-Date: 2009-11-17 08:57+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-15 10:06+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
 #: model:ir.module.module,shortdesc:base_iban.module_meta_information
 msgid "Create IBAN bank accounts"
-msgstr ""
+msgstr "Kreiranje bančnih računov IBAN"
 
 #. module: base_iban
 #: code:addons/base_iban/base_iban.py:0
@@ -27,7 +27,7 @@ msgstr ""
 msgid ""
 "The IBAN does not seems to be correct. You should have entered something "
 "like this %s"
-msgstr ""
+msgstr "Kot kaže je IBAN napačno vnešen. Vnesti bi morali nekaj podobnega %s"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
@@ -42,7 +42,7 @@ msgstr "Mednarodna številka bančnega računa (IBAN)"
 #. module: base_iban
 #: model:ir.model,name:base_iban.model_res_partner_bank
 msgid "Bank Accounts"
-msgstr ""
+msgstr "Bančni računi"
 
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
@@ -63,7 +63,7 @@ msgstr "številka računa (iban)"
 #: code:addons/base_iban/base_iban.py:0
 #, python-format
 msgid "The IBAN is invalid, It should begin with the country code"
-msgstr ""
+msgstr "Napačen IBAN. Začeti se mora z oznako države"
 
 #. module: base_iban
 #: field:res.partner.bank,iban:0
diff --git a/addons/base_module_doc_rst/base_module_doc_rst.py b/addons/base_module_doc_rst/base_module_doc_rst.py
index 9d86a191177..57b26fd0d44 100755
--- a/addons/base_module_doc_rst/base_module_doc_rst.py
+++ b/addons/base_module_doc_rst/base_module_doc_rst.py
@@ -35,7 +35,7 @@ class module(osv.osv):
         'file_graph': fields.binary('Relationship Graph'),
             }
 
-    def _get_graphical_representation(self, cr, uid, model_ids, level=1, context={}):
+    def _get_graphical_representation(self, cr, uid, model_ids, level=1, context=None):
         obj_model = self.pool.get('ir.model')
         if level == 0:
             return tuple()
@@ -86,7 +86,7 @@ class module(osv.osv):
             )
         return res
 
-    def _get_module_objects(self, cr, uid, module, context={}):
+    def _get_module_objects(self, cr, uid, module, context=None):
         obj_model = self.pool.get('ir.model')
         obj_mod_data = self.pool.get('ir.model.data')
         obj_ids = []
@@ -99,6 +99,7 @@ class module(osv.osv):
         return obj_ids
 
     def get_relation_graph(self, cr, uid, module_name, context=None):
+        if context is None: context = {}
         object_ids = self._get_module_objects(cr, uid, module_name, context=context)
         if not object_ids:
             return {'module_file': False}
diff --git a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
index c5a09d8095d..b34f55bba6c 100644
--- a/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
+++ b/addons/base_module_doc_rst/i18n/base_module_doc_rst.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:16+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_module_doc_rst/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
index 6f3db7e3273..2d3704fd5b7 100644
--- a/addons/base_module_doc_rst/report/report_proximity_graph.py
+++ b/addons/base_module_doc_rst/report/report_proximity_graph.py
@@ -74,7 +74,7 @@ class report_graph(report.interface.report_int):
         input.close()
         return output.read()
 
-    def create(self, cr, uid, ids, data, context={}):
+    def create(self, cr, uid, ids, data, context=None):
         pdf_string = self.get_proximity_graph(cr, uid, data['id'])
         return (pdf_string, 'pdf')
 
diff --git a/addons/base_module_doc_rst/wizard/generate_relation_graph.py b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
index 0d4453b0bcc..7b04f183129 100644
--- a/addons/base_module_doc_rst/wizard/generate_relation_graph.py
+++ b/addons/base_module_doc_rst/wizard/generate_relation_graph.py
@@ -28,7 +28,7 @@ form_rep = '''<?xml version="1.0"?>
     <label colspan="2" string="(Relationship Graphs generated)" align="0.0"/>
 </form>'''
 
-def _get_graph(self, cr, uid, datas, context={}):
+def _get_graph(self, cr, uid, datas, context=None):
     mod_obj = pooler.get_pool(cr.dbname).get('ir.module.module')
     modules = mod_obj.browse(cr, uid, datas['ids'], context=context)
     for module in modules:
diff --git a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
index 02561c6eb5c..b7a5d6da397 100644
--- a/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
+++ b/addons/base_module_doc_rst/wizard/wizard_tech_guide_rst.py
@@ -404,7 +404,7 @@ class wizard_tech_guide_rst(wizard.interface):
             'name': 'modules_technical_guide_rst.tgz'
         }
 
-    def _get_views(self, cr, uid, module_id, context={}):
+    def _get_views(self, cr, uid, module_id, context=None):
         pool = pooler.get_pool(cr.dbname)
         module_module_obj = pool.get('ir.module.module')
         res = {}
diff --git a/addons/base_module_quality/i18n/base_module_quality.pot b/addons/base_module_quality/i18n/base_module_quality.pot
index cae4db7db86..64d2369dfbf 100644
--- a/addons/base_module_quality/i18n/base_module_quality.pot
+++ b/addons/base_module_quality/i18n/base_module_quality.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:16+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:03+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_module_quality/i18n/pt.po b/addons/base_module_quality/i18n/pt.po
index 9e1c57fc75e..1290ac5861f 100644
--- a/addons/base_module_quality/i18n/pt.po
+++ b/addons/base_module_quality/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-03 03:42+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 10:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/i18n/sv.po b/addons/base_module_quality/i18n/sv.po
index f2c5749d3e1..4983a90a64a 100644
--- a/addons/base_module_quality/i18n/sv.po
+++ b/addons/base_module_quality/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py
index ef2994e6a27..9e836ec9d0e 100644
--- a/addons/base_module_quality/wizard/module_quality_check.py
+++ b/addons/base_module_quality/wizard/module_quality_check.py
@@ -28,7 +28,7 @@ from osv import osv, fields
 
 class quality_check(wizard.interface):
 
-    def _create_quality_check(self, cr, uid, data, context={}):
+    def _create_quality_check(self, cr, uid, data, context=None):
         pool = pooler.get_pool(cr.dbname)
         obj_quality = pool.get('module.quality.check')
         objs = []
diff --git a/addons/base_module_quality/wizard/quality_save_report.py b/addons/base_module_quality/wizard/quality_save_report.py
index 853698dee1f..7d03338e623 100644
--- a/addons/base_module_quality/wizard/quality_save_report.py
+++ b/addons/base_module_quality/wizard/quality_save_report.py
@@ -40,7 +40,7 @@ fields_rep = {
   'module_file': {'string': 'Save report', 'type': 'binary', 'required': True},
 }
 
-def get_detail(self, cr, uid, datas, context={}):
+def get_detail(self, cr, uid, datas, context=None):
     data = pooler.get_pool(cr.dbname).get('module.quality.detail').browse(cr, uid, datas['id'])
     if not data.detail:
         raise wizard.except_wizard(_('Warning'), _('No report to save!'))
diff --git a/addons/base_module_record/i18n/base_module_record.pot b/addons/base_module_record/i18n/base_module_record.pot
index a54a95e172d..86bc4190d82 100644
--- a/addons/base_module_record/i18n/base_module_record.pot
+++ b/addons/base_module_record/i18n/base_module_record.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:17+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:04+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_report_creator/base_report_creator.py b/addons/base_report_creator/base_report_creator.py
index d651e6206f8..28228b4ab58 100644
--- a/addons/base_report_creator/base_report_creator.py
+++ b/addons/base_report_creator/base_report_creator.py
@@ -36,7 +36,7 @@ class report_creator(osv.osv):
     def export_data(self, cr, uid, ids, fields_to_export, context=None):
         if context is None:
             context = {}
-        data_l = self.read(cr, uid, ids, ['sql_query'], context)
+        data_l = self.read(cr, uid, ids, ['sql_query'], context=context)
         final_datas = []
         #start Loop
         for record in data_l:
@@ -181,7 +181,7 @@ class report_creator(osv.osv):
         }
         return result
 
-    def read(self, cr, user, ids, fields = None, context = None, load = '_classic_read'):
+    def read(self, cr, user, ids, fields=None, context=None, load='_classic_read'):
         """
         overrides  orm Read method.Read List of fields for report creator.
         @param cr: the current row, from the database cursor,
@@ -355,13 +355,13 @@ class report_creator(osv.osv):
         """
         return self.model_set_id and 'min('+self.model_set_id+'.id)'
 
-    def _sql_query_get(self, cr, uid, ids, prop, unknow_none, context, where_plus=[], limit=None, offset=None):
+    def _sql_query_get(self, cr, uid, ids, prop, unknow_none, context=None, where_plus=[], limit=None, offset=None):
         """
         Get sql query which return on sql_query field.
         @return: Dictionary of sql query.
         """
         result = {}
-        for obj in self.browse(cr, uid, ids):
+        for obj in self.browse(cr, uid, ids, context=context):
             fields = []
             groupby = []
             i = 0
@@ -449,7 +449,7 @@ class report_creator(osv.osv):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for base creator report form
         """
-        if not context:
+        if context is None:
             context = {}
 
         rep = self.browse(cr, uid, ids, context=context)
@@ -474,7 +474,7 @@ class report_creator(osv.osv):
 
         return value
 
-    def _function_field(self, cr, uid, ids):
+    def _function_field(self, cr, uid, ids, context=None):
         """
         constraints function which specify that
                 not display field which are not stored in Database.
@@ -484,7 +484,7 @@ class report_creator(osv.osv):
         @return: True if display field which are  stored in database.
                      or false if display field which are not store in dtabase.
         """
-        this_objs = self.browse(cr, uid, ids)
+        this_objs = self.browse(cr, uid, ids, context=context)
         for obj in this_objs:
             for fld in obj.field_ids:
                 # Allowing to use count(*)
@@ -495,7 +495,7 @@ class report_creator(osv.osv):
                     return False
         return True
 
-    def _aggregation_error(self, cr, uid, ids):
+    def _aggregation_error(self, cr, uid, ids, context=None):
         """
         constraints function which specify that
                 aggregate function to the non calculated field..
@@ -505,10 +505,9 @@ class report_creator(osv.osv):
         @return: True if model colume type is in integer or float.
                      or false model colume type is not in integer or float.
         """
-
         aggregate_columns = ('integer', 'float')
         apply_functions = ('sum', 'min', 'max', 'avg', 'count')
-        this_objs = self.browse(cr, uid, ids)
+        this_objs = self.browse(cr, uid, ids, context=context)
         for obj in this_objs:
             for fld in obj.field_ids:
                 # Allowing to use count(*)
@@ -519,9 +518,9 @@ class report_creator(osv.osv):
                     return False
         return True
 
-    def _calander_view_error(self, cr, uid, ids):
+    def _calander_view_error(self, cr, uid, ids, context=None):
         required_types = []
-        this_objs = self.browse(cr, uid, ids)
+        this_objs = self.browse(cr, uid, ids, context=context)
         for obj in this_objs:
             if obj.view_type1 == 'calendar' or obj.view_type2 == 'calendar' or obj.view_type3 == 'calendar':
                 for fld in obj.field_ids:
diff --git a/addons/base_report_creator/i18n/base_report_creator.pot b/addons/base_report_creator/i18n/base_report_creator.pot
index e730259d489..a1fc33f1592 100644
--- a/addons/base_report_creator/i18n/base_report_creator.pot
+++ b/addons/base_report_creator/i18n/base_report_creator.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:17+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:04+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_report_creator/i18n/fr.po b/addons/base_report_creator/i18n/fr.po
index 1ad9e8e10b7..e833d3df59a 100644
--- a/addons/base_report_creator/i18n/fr.po
+++ b/addons/base_report_creator/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-09 11:27+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-15 20:33+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
@@ -145,6 +146,8 @@ msgstr "Somme"
 #: constraint:base_report_creator.report:0
 msgid "You must have to give calendar view's color,start date and delay."
 msgstr ""
+"Vous devez préciser les codes couleurs, la date de début et le délai de la "
+"vue calendaire."
 
 #. module: base_report_creator
 #: field:base_report_creator.report,model_ids:0
diff --git a/addons/base_report_creator/wizard/report_menu_create.py b/addons/base_report_creator/wizard/report_menu_create.py
index 84b952f976a..efa61c556d1 100644
--- a/addons/base_report_creator/wizard/report_menu_create.py
+++ b/addons/base_report_creator/wizard/report_menu_create.py
@@ -40,7 +40,7 @@ class report_menu_create(osv.osv_memory):
         @param ids: List of Report Menu Create's IDs
         @return: Dictionary {}.
         """
-        if not context:
+        if context is None:
             context = {}
         context_id = context and context.get('active_id', False) or False
         obj_menu = self.pool.get('ir.ui.menu')
@@ -52,7 +52,7 @@ class report_menu_create(osv.osv_memory):
                 return {}
             data = data[0]
 
-            board = obj_board.browse(cr, uid, context_id)
+            board = obj_board.browse(cr, uid, context_id, context=context)
             view = board.view_type1
             if board.view_type2:
                 view += ',' + board.view_type2
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index 4897865db1e..4bb86bba035 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -40,7 +40,7 @@ class report_xml(osv.osv):
             fp = open(addons.get_module_resource('base_report_designer','openerp_sxw2rml', 'normalized_odt2rml.xsl'),'rb')
         return  {'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read()))}
 
-    def upload_report(self, cr, uid, report_id, file_sxw, file_type, context):
+    def upload_report(self, cr, uid, report_id, file_sxw, file_type, context=None):
         '''
         Untested function
         '''
@@ -57,8 +57,8 @@ class report_xml(osv.osv):
         pool.get('ir.actions.report.xml').register_all(cr)
         return True
 
-    def report_get(self, cr, uid, report_id, context={}):
-        report = self.browse(cr, uid, report_id, context)
+    def report_get(self, cr, uid, report_id, context=None):
+        report = self.browse(cr, uid, report_id, context=context)
         return {
             'file_type' : report.report_type, 
             'report_sxw_content': report.report_sxw_content and base64.encodestring(report.report_sxw_content) or False, 
diff --git a/addons/base_report_designer/i18n/base_report_designer.pot b/addons/base_report_designer/i18n/base_report_designer.pot
index 2488a5a7d66..3a898c8b96b 100644
--- a/addons/base_report_designer/i18n/base_report_designer.pot
+++ b/addons/base_report_designer/i18n/base_report_designer.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:18+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:18+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:05+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,11 +20,21 @@ msgstr ""
 msgid "base.report.sxw"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "OpenERP Report Designer Configuration"
+msgstr ""
+
 #. module: base_report_designer
 #: model:ir.module.module,shortdesc:base_report_designer.module_meta_information
 msgid "Report designer interface module"
 msgstr ""
 
+#. module: base_report_designer
+#: view:base_report_designer.installer:0
+msgid "This plug-in allows you to create/modify OpenERP Reports into OpenOffice Writer."
+msgstr ""
+
 #. module: base_report_designer
 #: view:base.report.file.sxw:0
 msgid "Upload the modified report"
@@ -93,6 +103,7 @@ msgid "Get a report"
 msgstr ""
 
 #. module: base_report_designer
+#: view:base_report_designer.installer:0
 #: model:ir.actions.act_window,name:base_report_designer.action_report_designer_wizard
 msgid "OpenERP Report Designer"
 msgstr ""
diff --git a/addons/base_report_designer/i18n/el.po b/addons/base_report_designer/i18n/el.po
index dba2bf9f1fd..4bfb680b54c 100644
--- a/addons/base_report_designer/i18n/el.po
+++ b/addons/base_report_designer/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 13:11+0000\n"
-"Last-Translator: Dimitrios Ntoulas <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 06:05+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_report_designer/installer.py b/addons/base_report_designer/installer.py
index 082383bde8c..d21fd11af00 100644
--- a/addons/base_report_designer/installer.py
+++ b/addons/base_report_designer/installer.py
@@ -29,8 +29,8 @@ class base_report_designer_installer(osv.osv_memory):
     _name = 'base_report_designer.installer'
     _inherit = 'res.config.installer'
 
-    def default_get(self, cr, uid, fields, context={}):
-        data = super(base_report_designer_installer, self).default_get(cr, uid, fields, context)
+    def default_get(self, cr, uid, fields, context=None):
+        data = super(base_report_designer_installer, self).default_get(cr, uid, fields, context=context)
         plugin_file = open(addons.get_module_resource('base_report_designer','plugin', 'openerp_report_designer.zip'),'rb')
         data['plugin_file'] = base64.encodestring(plugin_file.read())
         return data
diff --git a/addons/base_report_designer/wizard/base_report_designer_modify.py b/addons/base_report_designer/wizard/base_report_designer_modify.py
index ab942b6037a..d0790cdc0ad 100644
--- a/addons/base_report_designer/wizard/base_report_designer_modify.py
+++ b/addons/base_report_designer/wizard/base_report_designer_modify.py
@@ -38,11 +38,11 @@ class base_report_sxw(osv.osv_memory):
     }
 
 
-    def get_report(self, cr, uid, ids, context):
-        data=self.read(cr,uid,ids)[0]
+    def get_report(self, cr, uid, ids, context=None):
+        data = self.read(cr, uid, ids, context=context)[0]
         data_obj = self.pool.get('ir.model.data')
         id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_sxw')
-        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context)
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
         return {
@@ -74,12 +74,11 @@ class base_report_file_sxw(osv.osv_memory):
              @return: A dictionary which of fields with values.
 
         """
-
         res = super(base_report_file_sxw, self).default_get(cr, uid, fields, context=context)
         report_id1 = self.pool.get('base.report.sxw').search(cr,uid,[])
-        data=self.pool.get('base.report.sxw').read(cr,uid,report_id1)[0]
-        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
-        if not context:
+        data = self.pool.get('base.report.sxw').read(cr, uid, report_id1, context=context)[0]
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context)
+        if context is None:
             context={}
         if 'report_id' in fields:
             res['report_id'] = data['report_id']
@@ -92,7 +91,7 @@ class base_report_file_sxw(osv.osv_memory):
         'file_sxw_upload':fields.binary('Your .SXW file',required=True)
     }
 
-    def upload_report(self, cr, uid, ids, context):
+    def upload_report(self, cr, uid, ids, context=None):
         from base_report_designer import  openerp_sxw2rml
         import StringIO
         data=self.read(cr,uid,ids)[0]
@@ -106,7 +105,7 @@ class base_report_file_sxw(osv.osv_memory):
         cr.commit()
         data_obj = self.pool.get('ir.model.data')
         id2 = data_obj._get_id(cr, uid, 'base_report_designer', 'view_base_report_file_rml')
-        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context)
         if id2:
             id2 = data_obj.browse(cr, uid, id2, context=context).res_id
         return {
@@ -135,12 +134,12 @@ class base_report_rml_save(osv.osv_memory):
              @return: A dictionary which of fields with values.
 
         """
+        
         res = super(base_report_rml_save, self).default_get(cr, uid, fields, context=context)
         report_id = self.pool.get('base.report.sxw').search(cr,uid,[])
-        data=self.pool.get('base.report.file.sxw').read(cr,uid,report_id)[0]
-        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context)
-        if not context:
-            context={}
+        data = self.pool.get('base.report.file.sxw').read(cr, uid, report_id, context=context)[0]
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, data['report_id'], context=context)
+        
         if 'file_rml' in fields:
             res['file_rml'] =  base64.encodestring(report.report_rml_content)
         return res
diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 934e1a3bdf8..85d01779842 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -42,10 +42,10 @@ class base_setup_config_choice(osv.osv_memory):
         file_data = tools.file_open(path,'rb').read()
         return base64.encodestring(file_data)
 
-    def get_users(self, cr, uid, context={}):
+    def get_users(self, cr, uid, context=None):
         user_obj = self.pool.get('res.users')
         user_ids = user_obj.search(cr, uid, [])
-        users = user_obj.browse(cr, uid, user_ids)
+        users = user_obj.browse(cr, uid, user_ids, context=context)
         user_str = '\n'.join(map(lambda x: '    - %s :\n\t\tLogin : %s \n\t\tPassword : %s' % (x.name, x.login, x.password), users))
         return _('The following users have been installed : \n')+ user_str
 
diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot
index 7e805fb28bf..a1403b195f3 100644
--- a/addons/base_setup/i18n/base_setup.pot
+++ b/addons/base_setup/i18n/base_setup.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:18+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:18+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:05+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,14 +20,19 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#. module: base_setup
+#: view:base.setup.installer:0
+msgid "Install"
+msgstr ""
+
 #. module: base_setup
 #: field:base.setup.installer,account_voucher:0
 msgid "Invoicing"
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.company,name:0
-msgid "Company Name"
+#: field:base.setup.installer,hr:0
+msgid "Human Resources"
 msgstr ""
 
 #. module: base_setup
@@ -149,6 +154,11 @@ msgstr ""
 msgid "res_config_contents"
 msgstr ""
 
+#. module: base_setup
+#: view:base.setup.company:0
+msgid "Your company information will be used to personalize documents issued with OpenERP such as invoices, sales orders and much more."
+msgstr ""
+
 #. module: base_setup
 #: view:base.setup.installer:0
 msgid "title"
@@ -170,8 +180,8 @@ msgid "Helps you manage your projects and tasks by tracking them, generating pla
 msgstr ""
 
 #. module: base_setup
-#: help:base.setup.installer,point_of_sale:0
-msgid "Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more."
+#: field:base.setup.company,name:0
+msgid "Company Name"
 msgstr ""
 
 #. module: base_setup
@@ -190,8 +200,8 @@ msgid "Allows you to create your invoices and track the payments. It is an easie
 msgstr ""
 
 #. module: base_setup
-#: field:base.setup.installer,hr:0
-msgid "Human Resources"
+#: model:ir.model,name:base_setup.model_base_setup_company
+msgid "base.setup.company"
 msgstr ""
 
 #. module: base_setup
@@ -252,6 +262,12 @@ msgid "Lets you install addons geared towards sharing knowledge with and between
 msgstr ""
 
 #. module: base_setup
+#: view:base.setup.installer:0
+msgid "Select the Applications you want your system to cover. If you are not sure about your exact needs at this stage, you can easily install them later."
+msgstr ""
+
+#. module: base_setup
+#: view:base.setup.company:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_company
 msgid "Company Configuration"
 msgstr ""
@@ -261,6 +277,11 @@ msgstr ""
 msgid "Logo"
 msgstr ""
 
+#. module: base_setup
+#: help:base.setup.installer,point_of_sale:0
+msgid "Helps you get the most out of your points of sales with fast sale encoding, simplified payment mode encoding, automatic picking lists generation and more."
+msgstr ""
+
 #. module: base_setup
 #: field:base.setup.installer,purchase:0
 msgid "Purchase Management"
@@ -368,8 +389,8 @@ msgid "Street"
 msgstr ""
 
 #. module: base_setup
-#: model:ir.model,name:base_setup.model_base_setup_company
-msgid "base.setup.company"
+#: view:base.setup.company:0
+msgid "Configure Your Company Information"
 msgstr ""
 
 #. module: base_setup
@@ -378,6 +399,7 @@ msgid "Example: http://openerp.com"
 msgstr ""
 
 #. module: base_setup
+#: view:base.setup.installer:0
 #: model:ir.actions.act_window,name:base_setup.action_base_setup_installer
 msgid "Install Applications"
 msgstr ""
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index eb9d468da4f..91f6ab4e7dd 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index 0e60eea8360..f5425d4a3d5 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 13:07+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 22:02+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/todo.py b/addons/base_setup/todo.py
index b30669382a5..c7478801598 100644
--- a/addons/base_setup/todo.py
+++ b/addons/base_setup/todo.py
@@ -65,7 +65,7 @@ class base_setup_company(osv.osv_memory):
         company_id = companies.search(cr, uid, [], limit=1, order="id")
         if not company_id or 'company_id' not in fields_list:
             return defaults
-        company = companies.browse(cr, uid, company_id[0])
+        company = companies.browse(cr, uid, company_id[0], context=context)
         defaults['company_id'] = company.id
 
         if not self._show_company_data(cr, uid, context=context):
diff --git a/addons/base_synchro/base_synchro_obj.py b/addons/base_synchro/base_synchro_obj.py
index 64fad4cd687..f71e64cdf77 100755
--- a/addons/base_synchro/base_synchro_obj.py
+++ b/addons/base_synchro/base_synchro_obj.py
@@ -67,10 +67,10 @@ class base_synchro_obj(osv.osv):
     # Return a list of changes: [ (date, id) ]
     #
 
-    def get_ids(self, cr, uid, object, dt, domain=[], context={}):
-        return self._get_ids(cr, uid, object, dt, domain, context)
+    def get_ids(self, cr, uid, object, dt, domain=[], context=None):
+        return self._get_ids(cr, uid, object, dt, domain, context=context)
 
-    def _get_ids(self, cr, uid, object, dt, domain=[], context={}):
+    def _get_ids(self, cr, uid, object, dt, domain=[], context=None):
         result = []
         if dt:
             domain2 = domain+[('write_date','>=',dt)]
diff --git a/addons/base_synchro/i18n/base_synchro.pot b/addons/base_synchro/i18n/base_synchro.pot
index 3d82aa6e24c..0c8fc5a760b 100644
--- a/addons/base_synchro/i18n/base_synchro.pot
+++ b/addons/base_synchro/i18n/base_synchro.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:19+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py
index c83ec7df0e9..d3c1de40d6d 100644
--- a/addons/base_synchro/wizard/base_synchro.py
+++ b/addons/base_synchro/wizard/base_synchro.py
@@ -65,7 +65,7 @@ class base_synchro(osv.osv_memory):
     report_create = 0
     report_write = 0
 
-    def synchronize(self, cr, uid, server, object, context):
+    def synchronize(self, cr, uid, server, object, context=None):
         pool = pooler.get_pool(cr.dbname)
         self.meta = {}
         ids = []
@@ -136,7 +136,7 @@ class base_synchro(osv.osv_memory):
         self.meta = {}
         return True
 
-    def get_id(self, cr, uid, object_id, id, action, context={}):
+    def get_id(self, cr, uid, object_id, id, action, context=None):
         pool = pooler.get_pool(cr.dbname)
         line_pool = pool.get('base.synchro.obj.line')
         field_src = (action=='u') and 'local_id' or 'remote_id'
@@ -147,7 +147,7 @@ class base_synchro(osv.osv_memory):
             result  = line_pool.read(cr, uid, rid, [field_dest], context=context)[0][field_dest]
         return result
 
-    def relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context={}):
+    def relation_transform(self, cr, uid, pool_src, pool_dest, object, id, action, context=None):
         if not id:
             return False
         pool = pooler.get_pool(cr.dbname)
@@ -181,10 +181,10 @@ class base_synchro(osv.osv_memory):
     #        Otherwise, use the name_search method
     #
 
-    def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context={}):
+    def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context=None):
         self.meta.setdefault(pool_src, {})
         if not object in self.meta[pool_src]:
-            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context)
+            self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context=context)
         fields = self.meta[pool_src][object]
 
         for f in fields:
@@ -196,7 +196,7 @@ class base_synchro(osv.osv_memory):
                 del data[f]
             elif ftype == 'many2one':
                 if data[f]:
-                    df = self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context)
+                    df = self.relation_transform(cr, uid, pool_src, pool_dest, fields[f]['relation'], data[f][0], action, context=context)
                     data[f] = df
                     if not data[f]:
                         del data[f]
@@ -212,11 +212,11 @@ class base_synchro(osv.osv_memory):
     #
 
 
-    def upload_download(self, cr, uid, ids, context):
+    def upload_download(self, cr, uid, ids, context=None):
         start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
-        syn_obj = self.browse(cr, uid, ids)[0]
+        syn_obj = self.browse(cr, uid, ids, context=context)[0]
         pool = pooler.get_pool(cr.dbname)
-        server = pool.get('base.synchro.server').browse(cr, uid, ids, context)[0]
+        server = pool.get('base.synchro.server').browse(cr, uid, ids, context=context)[0]
         for object in server.obj_ids:
             dt = time.strftime('%Y-%m-%d %H:%M:%S')
             self.synchronize(cr, uid, server, object, context)
@@ -249,7 +249,7 @@ Exceptions:
             })
             return True
 
-    def upload_download_multi_thread(self, cr, uid, data, context):
+    def upload_download_multi_thread(self, cr, uid, data, context=None):
         threaded_synchronization = threading.Thread(target=self.upload_download, args=(cr, uid, data, context))
         threaded_synchronization.run()
         data_obj = self.pool.get('ir.model.data')
diff --git a/addons/base_tools/i18n/base_tools.pot b/addons/base_tools/i18n/base_tools.pot
index ffa57e25053..8be06e1513a 100644
--- a/addons/base_tools/i18n/base_tools.pot
+++ b/addons/base_tools/i18n/base_tools.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:19+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_vat/base_vat.py b/addons/base_vat/base_vat.py
index a6b396fd506..e7c4a70469f 100644
--- a/addons/base_vat/base_vat.py
+++ b/addons/base_vat/base_vat.py
@@ -52,12 +52,12 @@ class res_partner(osv.osv):
         vat_country, vat_number = vat[:2].lower(), vat[2:].replace(' ', '')
         return vat_country, vat_number
 
-    def check_vat(self, cr, uid, ids):
+    def check_vat(self, cr, uid, ids, context=None):
         '''
         Check the VAT number depending of the country.
         http://sima-pc.com/nif.php
         '''
-        for partner in self.browse(cr, uid, ids):
+        for partner in self.browse(cr, uid, ids, context=context):
             if not partner.vat:
                 continue
             vat_country, vat_number = self._split_vat(partner.vat)
@@ -75,7 +75,7 @@ class res_partner(osv.osv):
         'vat_subjected': fields.boolean('VAT Legal Statement', help="Check this box if the partner is subjected to the VAT. It will be used for the VAT legal statement.")
     }
 
-    def _construct_constraint_msg(self, cr, uid, ids):
+    def _construct_constraint_msg(self, cr, uid, ids, context=None):
         def default_vat_check(cn, vn):
             # by default, a VAT number is valid if:
             #  it starts with 2 letters
diff --git a/addons/base_vat/i18n/base_vat.pot b/addons/base_vat/i18n/base_vat.pot
index a2ebe7eb169..8dd73472696 100644
--- a/addons/base_vat/i18n/base_vat.pot
+++ b/addons/base_vat/i18n/base_vat.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:20+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:20+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:06+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/base_vat/i18n/sv.po b/addons/base_vat/i18n/sv.po
index 4fbf4ab25e3..d8ae3eb1f32 100644
--- a/addons/base_vat/i18n/sv.po
+++ b/addons/base_vat/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 17:05+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2010-12-15 12:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
diff --git a/addons/board/board.py b/addons/board/board.py
index 6049f501e00..8662aa5bff2 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -38,8 +38,6 @@ class board_board(osv.osv):
         @param ids: List of Board's IDs
         @return: arch of xml view.
         """
-        if not context:
-            context = {}
         board = self.pool.get('board.board').browse(cr, uid, ids, context=context)
         left = []
         right = []
@@ -70,7 +68,7 @@ class board_board(osv.osv):
 
         return arch
 
-    def write(self, cr, uid, ids, vals, context = {}):
+    def write(self, cr, uid, ids, vals, context=None):
 
         """
         Writes values in one or several fields.
@@ -81,10 +79,10 @@ class board_board(osv.osv):
                      dictionary must be with the form: {‘name_of_the_field’: value, ...}.
         @return: True
         """
-        result = super(board_board, self).write(cr, uid, ids, vals, context)
+        result = super(board_board, self).write(cr, uid, ids, vals, context=context)
 
-        board = self.pool.get('board.board').browse(cr, uid, ids[0])
-        view = self.create_view(cr, uid, ids[0], context)
+        board = self.pool.get('board.board').browse(cr, uid, ids[0], context=context)
+        view = self.create_view(cr, uid, ids[0], context=context)
         id = board.view_id.id
         cr.execute("update ir_ui_view set arch=%s where id=%s", (view, id))
         return result
@@ -99,18 +97,16 @@ class board_board(osv.osv):
         @return: id of new created record of board.board.
         """
 
-        if not context:
-            context = {}
 
         if not 'name' in vals:
             return False
-        id = super(board_board, self).create(cr, user, vals, context)
+        id = super(board_board, self).create(cr, user, vals, context=context)
         view_id = self.pool.get('ir.ui.view').create(cr, user, {
             'name': vals['name'],
             'model': 'board.board',
             'priority': 16,
             'type': 'form',
-            'arch': self.create_view(cr, user, id, context),
+            'arch': self.create_view(cr, user, id, context=context),
         })
 
         super(board_board, self).write(cr, user, [id], {'view_id': view_id}, context)
@@ -124,8 +120,6 @@ class board_board(osv.osv):
         @return: Dictionary of Fields, arch and toolbar.
         """
 
-        if not context:
-            context = {}
 
         res = {}
         res = super(board_board, self).fields_view_get(cr, user, view_id, view_type,\
@@ -135,7 +129,7 @@ class board_board(osv.osv):
                      [('user_id', '=', user), ('ref_id' ,'=', view_id)])
         if vids:
             view_id = vids[0]
-            arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id)
+            arch = self.pool.get('ir.ui.view.custom').browse(cr, user, view_id, context=context)
             res['arch'] = arch.arch
 
         res['toolbar'] = {'print': [], 'action': [], 'relate': []}
@@ -193,13 +187,13 @@ class board_note_type(osv.osv):
 
 board_note_type()
 
-def _type_get(self, cr, uid, context={}):
+def _type_get(self, cr, uid, context=None):
     """
     Get by default Note type.
     """
     obj = self.pool.get('board.note.type')
     ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['name'], context)
+    res = obj.read(cr, uid, ids, ['name'], context=context)
     res = [(r['name'], r['name']) for r in res]
     return res
 
diff --git a/addons/board/i18n/board.pot b/addons/board/i18n/board.pot
index 40aa3029d16..b7a307f554c 100644
--- a/addons/board/i18n/board.pot
+++ b/addons/board/i18n/board.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:20+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:20+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/board/i18n/sv.po b/addons/board/i18n/sv.po
index 41b55363ad4..d7d3aeb5e99 100644
--- a/addons/board/i18n/sv.po
+++ b/addons/board/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board/i18n/vi.po b/addons/board/i18n/vi.po
index e12a6818421..7318f13b0c7 100644
--- a/addons/board/i18n/vi.po
+++ b/addons/board/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-02 14:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 15:26+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
@@ -74,7 +74,7 @@ msgstr ""
 #: view:board.note:0
 #: view:res.log.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: board
 #: model:ir.model,name:board.model_board_board
diff --git a/addons/board/wizard/board_menu_create.py b/addons/board/wizard/board_menu_create.py
index e986ac7bb3c..2b688962265 100644
--- a/addons/board/wizard/board_menu_create.py
+++ b/addons/board/wizard/board_menu_create.py
@@ -40,7 +40,7 @@ class board_menu_create(osv.osv_memory):
         """
         data = context and context.get('active_id', False) or False
         if data:
-            board = self.pool.get('board.board').browse(cr, uid, data)
+            board = self.pool.get('board.board').browse(cr, uid, data, context=context)
             if not board.line_ids:
                 raise osv.except_osv(_('User Error!'),
                                      _('Please Insert Dashboard View(s) !'))
@@ -55,12 +55,12 @@ class board_menu_create(osv.osv_memory):
         @param ids: List of Board Menu Create's IDs
         @return: Dictionary {}.
         """
-        if not context:
+        if context is None:
             context = {}
 
         context_id = context and context.get('active_id', False) or False
         if context_id:
-            board = self.pool.get('board.board').browse(cr, uid, context_id)
+            board = self.pool.get('board.board').browse(cr, uid, context_id, context=context)
             action_id = self.pool.get('ir.actions.act_window').create(cr, uid, {
                 'name': board.name,
                 'view_type': 'form',
diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py
index a593f5e77bc..e7269b7ed89 100644
--- a/addons/caldav/calendar.py
+++ b/addons/caldav/calendar.py
@@ -148,7 +148,7 @@ def get_attribute_mapping(cr, uid, calname, context=None):
         @param calname: Get Calendar name
         @param context: A standard dictionary for contextual values """
 
-    if not context:
+    if context is None:
         context = {}
     pool = pooler.get_pool(cr.dbname)
     field_obj = pool.get('basic.calendar.fields')
@@ -159,7 +159,7 @@ def get_attribute_mapping(cr, uid, calname, context=None):
     type_id = type_obj.search(cr, uid, domain)
     fids = field_obj.search(cr, uid, [('type_id', '=', type_id[0])])
     res = {}
-    for field in field_obj.browse(cr, uid, fids):
+    for field in field_obj.browse(cr, uid, fids, context=context):
         attr = field.name.name
         res[attr] = {}
         res[attr]['field'] = field.field_id.name
@@ -469,7 +469,7 @@ class CalDAV(object):
             @param vals: Get Values
             @param context: A standard dictionary for contextual values
         """
-        if not context:
+        if context is None:
             context = {}
         ids = []
         model_obj = self.pool.get(context.get('model'))
@@ -591,7 +591,7 @@ class Calendar(CalDAV, osv.osv):
     }
 
     def get_calendar_objects(self, cr, uid, ids, parent=None, domain=None, context=None):
-        if not context:
+        if context is None:
             context = {}
         if not domain:
             domain = []
@@ -621,7 +621,7 @@ class Calendar(CalDAV, osv.osv):
         
 
     def get_cal_max_modified(self, cr, uid, ids, parent=None, domain=None, context=None):
-        if not context:
+        if context is None:
             context = {}
         if not domain:
             domain = []
@@ -651,12 +651,12 @@ class Calendar(CalDAV, osv.osv):
             @param vobj: the type of object to export
             @return the ical data.
         """
-        if not context:
+        if context is None:
            context = {}
         ctx_model = context.get('model', None)
         ctx_res_id = context.get('res_id', None)
         ical = vobject.iCalendar()
-        for cal in self.browse(cr, uid, ids):
+        for cal in self.browse(cr, uid, ids, context=context):
             for line in cal.line_ids:
                 if ctx_model and ctx_model != line.object_id.model:
                     continue
@@ -683,7 +683,7 @@ class Calendar(CalDAV, osv.osv):
             @param data_id: Get Data’s ID or False
             @param context: A standard dictionary for contextual values
         """
-        if not context:
+        if context is None:
             context = {}
         vals = []
         ical_data = content
@@ -1065,7 +1065,7 @@ class Timezone(CalDAV, osv.osv_memory):
             @param model: Get Model's name
             @param context: A standard dictionary for contextual values
         """
-        if not context:
+        if context is None:
             context = {}
         ctx = context.copy()
         ctx.update({'model': model})
@@ -1124,8 +1124,6 @@ class Alarm(CalDAV, osv.osv_memory):
             @param alarm_id: Get Alarm's Id
             @param context: A standard dictionary for contextual values
         """
-        if not context:
-            context = {}
         valarm = vevent.add('valarm')
         alarm_object = self.pool.get(model)
         alarm_data = alarm_object.read(cr, uid, alarm_id, [])
@@ -1159,7 +1157,8 @@ class Alarm(CalDAV, osv.osv_memory):
             @param ical_data: Get calendar's Data
             @param context: A standard dictionary for contextual values
         """
-
+        if context is None:
+            context = {}
         ctx = context.copy()
         ctx.update({'model': context.get('model', None)})
         self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
@@ -1221,7 +1220,8 @@ class Attendee(CalDAV, osv.osv_memory):
             @param ical_data: Get calendar's Data
             @param context: A standard dictionary for contextual values
         """
-
+        if context is None:
+            context = {}
         ctx = context.copy()
         ctx.update({'model': context.get('model', None)})
         self.__attribute__ = get_attribute_mapping(cr, uid, self._calname, ctx)
@@ -1245,7 +1245,7 @@ class Attendee(CalDAV, osv.osv_memory):
             @param attendee_ids: Get Attendee's Id
             @param context: A standard dictionary for contextual values
         """
-        if not context:
+        if context is None:
             context = {}
         attendee_object = self.pool.get(model)
         ctx = context.copy()
diff --git a/addons/caldav/calendar_collection.py b/addons/caldav/calendar_collection.py
index 52fe698647c..1258ba5bf18 100644
--- a/addons/caldav/calendar_collection.py
+++ b/addons/caldav/calendar_collection.py
@@ -65,8 +65,6 @@ class calendar_collection(osv.osv):
 
     def get_description(self, cr, uid, ids, context=None):
         #TODO : return description of all calendars
-        if not context:
-            context = {}
         return False
 
     def get_schedule_inbox_URL(self, cr, uid, ids, context=None):
diff --git a/addons/caldav/i18n/caldav.pot b/addons/caldav/i18n/caldav.pot
index 3e512317214..92e74c21dcf 100644
--- a/addons/caldav/i18n/caldav.pot
+++ b/addons/caldav/i18n/caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:21+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py
index 51d7e007fcf..fc54d6e77df 100644
--- a/addons/caldav/wizard/calendar_event_import.py
+++ b/addons/caldav/wizard/calendar_event_import.py
@@ -48,7 +48,7 @@ class calendar_event_import(osv.osv_memory):
             context = context.copy()
         context['uid'] = uid
 
-        for data in self.read(cr, uid, ids):
+        for data in self.read(cr, uid, ids, context=context):
             model = data.get('model', 'basic.calendar')
             model_obj = self.pool.get(model)
             context.update({'model': model})
diff --git a/addons/caldav/wizard/calendar_event_subscribe.py b/addons/caldav/wizard/calendar_event_subscribe.py
index f8dc7614507..f4f9e22cc60 100644
--- a/addons/caldav/wizard/calendar_event_subscribe.py
+++ b/addons/caldav/wizard/calendar_event_subscribe.py
@@ -50,7 +50,7 @@ class calendar_event_subscribe(osv.osv_memory):
             context = context.copy()
         context['uid'] = uid
 
-        for data in self.read(cr, uid, ids):
+        for data in self.read(cr, uid, ids, context=context):
             try:
                 f =  urllib.urlopen(data['url_path'])
                 caldata = f.fp.read()
diff --git a/addons/claim_from_delivery/i18n/claim_from_delivery.pot b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
index abc0a2244ec..d428e62b19a 100644
--- a/addons/claim_from_delivery/i18n/claim_from_delivery.pot
+++ b/addons/claim_from_delivery/i18n/claim_from_delivery.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:21+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:07+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 5336bdd23fb..4a8b9c089fc 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -47,27 +47,31 @@ AVAILABLE_PRIORITIES = [
 class crm_case(object):
     """A simple python class to be used for common functions """
 
-    def _get_default_partner_address(self, cr, uid, context):
+    def _get_default_partner_address(self, cr, uid, context=None):
         """Gives id of default address for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
+        if context is None:
+            context = {}
         if not context.get('portal', False):
             return False
         return self.pool.get('res.users').browse(cr, uid, uid, context).address_id.id
 
-    def _get_default_partner(self, cr, uid, context):
+    def _get_default_partner(self, cr, uid, context=None):
         """Gives id of partner for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
+        if context is None:
+            context = {}
         if not context.get('portal', False):
             return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not user.address_id:
             return False
         return user.address_id.partner_id.id
@@ -101,7 +105,7 @@ class crm_case(object):
                 })
         return super(osv.osv, self).copy(cr, uid, id, default, context=context)
     
-    def _get_default_email(self, cr, uid, context):
+    def _get_default_email(self, cr, uid, context=None):
         """Gives default email address for current user
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -110,23 +114,23 @@ class crm_case(object):
         """
         if not context.get('portal', False):
             return False
-        user = self.pool.get('res.users').browse(cr, uid, uid, context)
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if not user.address_id:
             return False
         return user.address_id.email
 
-    def _get_default_user(self, cr, uid, context):
+    def _get_default_user(self, cr, uid, context=None):
         """Gives current user id
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param context: A standard dictionary for contextual values
         """
-        if context.get('portal', False):
+        if context and context.get('portal', False):
             return False
         return uid
 
-    def _get_section(self, cr, uid, context):
+    def _get_section(self, cr, uid, context=None):
         """Gives section id for current User
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -151,13 +155,13 @@ class crm_case(object):
             return self._find_next_stage(cr, uid, stage_list, index + 1, current_seq, stage_pool)
             
     def stage_change(self, cr, uid, ids, context=None, order='sequence'):
-        if not context:
+        if context is None:
             context = {}
         stage_pool = self.pool.get('crm.case.stage')
         stage_type = context and context.get('stage_type','')
         current_seq = False
         next_stage_id = False
-        for case in self.browse(cr, uid, ids, context):
+        for case in self.browse(cr, uid, ids, context=context):
             next_stage = False
             data = {}
 
@@ -237,7 +241,7 @@ class crm_case(object):
         address = self.pool.get('res.partner.address').browse(cr, uid, add)
         return {'value': {'email_from': address.email, 'phone': address.phone}}
 
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
+    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
         mailgate_pool = self.pool.get('mailgate.thread')
         return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
                                        subject=subject, email=email, \
@@ -357,7 +361,7 @@ class crm_case(object):
         self._action(cr, uid, cases, 'draft')
         return True
 
-    def remind_partner(self, cr, uid, ids, context={}, attach=False):
+    def remind_partner(self, cr, uid, ids, context=None, attach=False):
 
         """
         @param self: The object pointer
@@ -370,7 +374,7 @@ class crm_case(object):
         return self.remind_user(cr, uid, ids, context, attach,
                 destination=False)
 
-    def remind_user(self, cr, uid, ids, context={}, attach=False,destination=True):
+    def remind_user(self, cr, uid, ids, context=None, attach=False, destination=True):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -379,7 +383,7 @@ class crm_case(object):
         @param context: A standard dictionary for contextual values
 
         """
-        for case in self.browse(cr, uid, ids):
+        for case in self.browse(cr, uid, ids, context=context):
             if not case.section_id.reply_to:
                 raise osv.except_osv(_('Error!'), ("Reply To is not specified in the sales team"))
             if not case.email_from:
@@ -421,7 +425,7 @@ class crm_case(object):
                 self._history(cr, uid, [case], _('Send'), history=True, subject=subject, email=dest, details=body, email_from=src)
         return True
 
-    def _check(self, cr, uid, ids=False, context={}):
+    def _check(self, cr, uid, ids=False, context=None):
         """
         Function called by the scheduler to process cases for date actions
         Only works on not done and cancelled cases
@@ -439,11 +443,11 @@ class crm_case(object):
                     time.strftime('%Y-%m-%d %H:%M:%S')))
 
         ids2 = map(lambda x: x[0], cr.fetchall() or [])
-        cases = self.browse(cr, uid, ids2, context)
+        cases = self.browse(cr, uid, ids2, context=context)
         return self._action(cr, uid, cases, False, context=context)
 
-    def _action(self, cr, uid, cases, state_to, scrit=None, context={}):
-        if not context:
+    def _action(self, cr, uid, cases, state_to, scrit=None, context=None):
+        if context is None:
             context = {}
         context['state_to'] = state_to
         rule_obj = self.pool.get('base.action.rule')
@@ -516,8 +520,8 @@ class crm_case_section(osv.osv):
     _description = "Sales Teams"
     _order = "complete_name"
 
-    def get_full_name(self, cr, uid, ids, field_name, arg, context={}):
-        return  dict(self.name_get(cr, uid, ids, context))
+    def get_full_name(self, cr, uid, ids, field_name, arg, context=None):
+        return  dict(self.name_get(cr, uid, ids, context=context))
 
     _columns = {
         'name': fields.char('Sales Team', size=64, required=True, translate=True),
@@ -547,7 +551,7 @@ class crm_case_section(osv.osv):
         ('code_uniq', 'unique (code)', 'The code of the sales team must be unique !')
     ]
 
-    def _check_recursion(self, cr, uid, ids):
+    def _check_recursion(self, cr, uid, ids, context=None):
 
         """
         Checks for recursion level for sales team
@@ -578,7 +582,7 @@ class crm_case_section(osv.osv):
         @param uid: the current user’s ID for security checks,
         @param ids: List of sales team ids
         """
-        if not context:
+        if context is None:
             context = {}
 
         res = []
@@ -653,8 +657,6 @@ def _links_get(self, cr, uid, context=None):
     @param uid: the current user’s ID for security checks,
     @param context: A standard dictionary for contextual values
     """
-    if not context:
-        context = {}
     obj = self.pool.get('res.request.link')
     ids = obj.search(cr, uid, [])
     res = obj.read(cr, uid, ids, ['object', 'name'], context)
diff --git a/addons/crm/crm_action_rule.py b/addons/crm/crm_action_rule.py
index f7df076e24d..477f9132fab 100644
--- a/addons/crm/crm_action_rule.py
+++ b/addons/crm/crm_action_rule.py
@@ -50,7 +50,7 @@ this if you want the rule to send an email to the partner."),
     }
     
 
-    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context={}):
+    def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context=None):
         body = self.format_mail(obj, body)
         if not emailfrom:
             if hasattr(obj, 'user_id')  and obj.user_id and obj.user_id.address_id and obj.user_id.address_id.email:
@@ -67,7 +67,7 @@ this if you want the rule to send an email to the partner."),
                     _("No E-Mail ID Found for your Company address!"))
         return tools.email_send(emailfrom, emails, name, body, reply_to=reply_to, openobject_id=str(obj.id))
     
-    def do_check(self, cr, uid, action, obj, context={}):
+    def do_check(self, cr, uid, action, obj, context=None):
         """ @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -102,7 +102,7 @@ this if you want the rule to send an email to the partner."),
         ok = ok and res_count
         return ok
 
-    def do_action(self, cr, uid, action, model_obj, obj, context={}):
+    def do_action(self, cr, uid, action, model_obj, obj, context=None):
         """ @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -138,7 +138,7 @@ this if you want the rule to send an email to the partner."),
         return True
 
 
-    def state_get(self, cr, uid, context={}):
+    def state_get(self, cr, uid, context=None):
         """Gets available states for crm
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -147,7 +147,7 @@ this if you want the rule to send an email to the partner."),
         res = super(base_action_rule, self).state_get(cr, uid, context=context)
         return res  + crm.AVAILABLE_STATES
 
-    def priority_get(self, cr, uid, context={}):
+    def priority_get(self, cr, uid, context=None):
         """@param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 8cc45c75e57..7aefcc3fb60 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -41,7 +41,7 @@ class crm_lead(crm_case, osv.osv):
     _description = "Lead"
     _order = "date_action, priority, id desc"
     _inherit = ['mailgate.thread','res.partner.address']
-    def _compute_day(self, cr, uid, ids, fields, args, context={}):
+    def _compute_day(self, cr, uid, ids, fields, args, context=None):
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -53,7 +53,7 @@ class crm_lead(crm_case, osv.osv):
         res_obj = self.pool.get('resource.resource')
 
         res = {}
-        for lead in self.browse(cr, uid, ids , context):
+        for lead in self.browse(cr, uid, ids, context=context):
             for field in fields:
                 res[lead.id] = {}
                 duration = 0
@@ -248,7 +248,7 @@ class crm_lead(crm_case, osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Value of action in dict
         """
-        if not context:
+        if context is None:
             context = {}
         context.update({'active_ids': ids})
 
@@ -295,9 +295,9 @@ class crm_lead(crm_case, osv.osv):
                         }
         return value
 
-    def write(self, cr, uid, ids, vals, context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         if 'date_closed' in vals:
-            return super(crm_lead,self).write(cr, uid, ids, vals, context)
+            return super(crm_lead,self).write(cr, uid, ids, vals, context=context)
             
         if 'stage_id' in vals and vals['stage_id']:
             stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context)
@@ -319,7 +319,7 @@ class crm_lead(crm_case, osv.osv):
                 self.write(cr, uid, ids, data)
         return stage
     
-    def message_new(self, cr, uid, msg, context):
+    def message_new(self, cr, uid, msg, context=None):
         """
         Automatically calls when new email message arrives
 
@@ -327,7 +327,6 @@ class crm_lead(crm_case, osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks
         """
-
         mailgate_pool = self.pool.get('email.server.tools')
 
         subject = msg.get('subject')
@@ -364,14 +363,13 @@ class crm_lead(crm_case, osv.osv):
 
         return res
 
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}):
+    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List of update mail’s IDs 
         """
-
         if isinstance(ids, (str, int, long)):
             ids = [ids]
 
diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py
index 13784741892..cc12caf315c 100644
--- a/addons/crm/crm_meeting.py
+++ b/addons/crm/crm_meeting.py
@@ -91,9 +91,6 @@ class crm_meeting(crm_case, osv.osv):
         @return: Dictionary value which open Crm Meeting form.
         """
 
-        if not context:
-            context = {}
-
         data_obj = self.pool.get('ir.model.data')
 
         value = {}
@@ -145,7 +142,7 @@ class calendar_attendee(osv.osv):
     _inherit = 'calendar.attendee'
     _description = 'Calendar Attendee'
 
-    def _compute_data(self, cr, uid, ids, name, arg, context):
+    def _compute_data(self, cr, uid, ids, name, arg, context=None):
        """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -154,7 +151,7 @@ class calendar_attendee(osv.osv):
         @param context: A standard dictionary for contextual values
         """
        name = name[0]
-       result = super(calendar_attendee, self)._compute_data(cr, uid, ids, name, arg, context)
+       result = super(calendar_attendee, self)._compute_data(cr, uid, ids, name, arg, context=context)
 
        for attdata in self.browse(cr, uid, ids, context=context):
             id = attdata.id
@@ -179,9 +176,7 @@ class res_users(osv.osv):
     _inherit = 'res.users'
 
     def create(self, cr, uid, data, context=None):
-        if context is None:
-            context = {}
-        user_id = super(res_users, self).create(cr, uid, data, context)
+        user_id = super(res_users, self).create(cr, uid, data, context=context)
         data_obj = self.pool.get('ir.model.data')
         try:
             data_id = data_obj._get_id(cr, uid, 'crm', 'ir_ui_view_sc_calendar0')
diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index 44f2b1b85a4..96c811ffb9e 100644
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -140,7 +140,7 @@ class crm_opportunity(osv.osv):
         self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
         return res
 
-    def onchange_stage_id(self, cr, uid, ids, stage_id, context={}):
+    def onchange_stage_id(self, cr, uid, ids, stage_id, context=None):
 
         """ @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -149,8 +149,8 @@ class crm_opportunity(osv.osv):
             @stage_id: change state id on run time """
         if not stage_id:
             return {'value':{}}
-
-        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context)
+        
+        stage = self.pool.get('crm.case.stage').browse(cr, uid, stage_id, context=context)
 
         if not stage.on_change:
             return {'value':{}}
@@ -173,7 +173,7 @@ class crm_opportunity(osv.osv):
         @return : Dictionary value for created Meeting view
         """
         value = {}
-        for opp in self.browse(cr, uid, ids):
+        for opp in self.browse(cr, uid, ids, context=context):
             data_obj = self.pool.get('ir.model.data')
 
             # Get meeting views
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index 96dde7139df..2b2066f6eb2 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -157,7 +157,7 @@ class crm_phonecall(crm_case, osv.osv):
         @return : Dictionary value for created Meeting view
         """
         value = {}
-        for phonecall in self.browse(cr, uid, ids):
+        for phonecall in self.browse(cr, uid, ids, context=context):
             data_obj = self.pool.get('ir.model.data')
 
             # Get meeting views
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot
index ed9341cfe18..a3ed5b3ad18 100644
--- a/addons/crm/i18n/crm.pot
+++ b/addons/crm/i18n/crm.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:24+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:24+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:10+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,7 @@ msgid "# Leads"
 msgstr ""
 
 #. module: crm
+#: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
@@ -193,9 +194,10 @@ msgid "Warning!"
 msgstr ""
 
 #. module: crm
-#: code:addons/crm/wizard/crm_send_email.py:0
-#, python-format
-msgid "Can not send mail!"
+#: view:crm.lead.report:0
+#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
+#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
+msgid "Opportunities Analysis"
 msgstr ""
 
 #. module: crm
@@ -352,6 +354,11 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
+#. module: crm
+#: view:crm.installer:0
+msgid "Enhance your core CRM Application with additional functionalities."
+msgstr ""
+
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
@@ -385,6 +392,7 @@ msgid "When a real project/opportunity is detected"
 msgstr ""
 
 #. module: crm
+#: selection:crm.case.stage,type:0
 #: field:crm.installer,crm_fundraising:0
 msgid "Fundraising"
 msgstr ""
@@ -512,10 +520,8 @@ msgid "Create Opportunity"
 msgstr ""
 
 #. module: crm
-#: selection:crm.lead.report,month:0
-#: selection:crm.meeting,month_list:0
-#: selection:crm.phonecall.report,month:0
-msgid "August"
+#: view:crm.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: crm
@@ -619,6 +625,11 @@ msgstr ""
 msgid "Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."
 msgstr ""
 
+#. module: crm
+#: selection:crm.case.stage,type:0
+msgid "Claim"
+msgstr ""
+
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
@@ -754,6 +765,7 @@ msgstr ""
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_partner_to_opportunity.py:0
 #: code:addons/crm/wizard/crm_phonecall_to_opportunity.py:0
+#: selection:crm.case.stage,type:0
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
@@ -1096,6 +1108,7 @@ msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
+#: model:crm.case.stage,name:crm.stage_opportunity5
 #: view:crm.lead:0
 msgid "Won"
 msgstr ""
@@ -1116,6 +1129,7 @@ msgid "HTML formatting?"
 msgstr ""
 
 #. module: crm
+#: field:crm.case.stage,type:0
 #: field:crm.lead,type:0
 #: field:crm.lead.report,type:0
 #: view:crm.meeting:0
@@ -1144,6 +1158,13 @@ msgstr ""
 msgid "Attachment"
 msgstr ""
 
+#. module: crm
+#: selection:crm.lead.report,month:0
+#: selection:crm.meeting,month_list:0
+#: selection:crm.phonecall.report,month:0
+msgid "August"
+msgstr ""
+
 #. module: crm
 #: view:crm.lead:0
 #: field:crm.lead,create_date:0
@@ -1229,7 +1250,9 @@ msgstr ""
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm.crm_case_stage_act
 #: model:ir.actions.act_window,name:crm.crm_lead_stage_act
+#: model:ir.actions.act_window,name:crm.crm_opportunity_stage_act
 #: model:ir.ui.menu,name:crm.menu_crm_lead_stage_act
+#: model:ir.ui.menu,name:crm.menu_crm_opportunity_stage_act
 msgid "Stages"
 msgstr ""
 
@@ -2277,10 +2300,9 @@ msgid "Weekly"
 msgstr ""
 
 #. module: crm
-#: view:crm.lead.report:0
-#: model:ir.actions.act_window,name:crm.action_report_crm_opportunity
-#: model:ir.ui.menu,name:crm.menu_report_crm_opportunities_tree
-msgid "Opportunities Analysis"
+#: code:addons/crm/wizard/crm_send_email.py:0
+#, python-format
+msgid "Can not send mail!"
 msgstr ""
 
 #. module: crm
@@ -2513,6 +2535,11 @@ msgstr ""
 msgid "Continue Process"
 msgstr ""
 
+#. module: crm
+#: view:crm.installer:0
+msgid "Configure Your CRM Application"
+msgstr ""
+
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
@@ -2646,7 +2673,6 @@ msgstr ""
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
-#: field:crm.case.stage,object_id:0
 msgid "Object Name"
 msgstr ""
 
@@ -2856,6 +2882,7 @@ msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
+#: model:crm.case.stage,name:crm.stage_opportunity1
 msgid "New"
 msgstr ""
 
@@ -2946,6 +2973,7 @@ msgid "Prospect Opportunity"
 msgstr ""
 
 #. module: crm
+#: view:crm.installer:0
 #: model:ir.actions.act_window,name:crm.action_crm_installer
 msgid "CRM Application Configuration"
 msgstr ""
@@ -2993,6 +3021,7 @@ msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead2
+#: model:crm.case.stage,name:crm.stage_opportunity2
 msgid "Qualification"
 msgstr ""
 
@@ -3271,6 +3300,11 @@ msgstr ""
 msgid "January"
 msgstr ""
 
+#. module: crm
+#: model:ir.actions.act_window,help:crm.crm_opportunity_stage_act
+msgid "Create specific stages that will help your sales better organise their sales pipeline by maintaining them to their sales opportunities. It will allow them to easily track how is positioned a specific opportunity in the sales cycle."
+msgstr ""
+
 #. module: crm
 #: model:process.process,name:crm.process_process_contractprocess0
 msgid "Contract"
@@ -3482,6 +3516,7 @@ msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
+#: model:crm.case.stage,name:crm.stage_opportunity6
 #: view:crm.lead:0
 msgid "Lost"
 msgstr ""
@@ -3535,6 +3570,7 @@ msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
+#: model:crm.case.stage,name:crm.stage_opportunity4
 msgid "Negotiation"
 msgstr ""
 
@@ -3571,6 +3607,7 @@ msgstr ""
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
+#: model:crm.case.stage,name:crm.stage_opportunity3
 msgid "Proposition"
 msgstr ""
 
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 84103b909ff..f77c5dba86b 100644
--- a/addons/crm/i18n/el.po
+++ b/addons/crm/i18n/el.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 14:21+0000\n"
+"PO-Revision-Date: 2010-12-15 09:39+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/crm/i18n/gl.po b/addons/crm/i18n/gl.po
index f5ad4f1de5f..00f4f22ab2d 100644
--- a/addons/crm/i18n/gl.po
+++ b/addons/crm/i18n/gl.po
@@ -9,13 +9,13 @@ msgstr ""
 "Project-Id-Version: crm-es\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2009-08-17 08:29+0000\n"
-"Last-Translator: Frco. Javier Rial <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 23:54+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Galego <g11n@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 7cc3c1087eb..00367324498 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/i18n/pt.po
@@ -7,26 +7,26 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-11 16:26+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 14:35+0000\n"
+"Last-Translator: Paulino Ascenção <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr ""
+msgstr "Dicas"
 
 #. module: crm
 #: view:crm.lead:0
 #: selection:crm.lead,type:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr ""
+msgstr "Dica"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
@@ -41,12 +41,12 @@ msgstr "Mensalmente"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Schedule a PhoneCall"
-msgstr ""
+msgstr "Agendar um telefonema"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr ""
+msgstr "Estágio do caso"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -67,7 +67,7 @@ msgstr "Mostrar como"
 #: field:crm.meeting,day:0
 #: selection:crm.meeting,select1:0
 msgid "Date of month"
-msgstr ""
+msgstr "Data do mês"
 
 #. module: crm
 #: view:crm.lead:0
@@ -90,18 +90,18 @@ msgstr ""
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr ""
+msgstr "Tempo para fechar"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "Estágio prévio"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:0
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "Não pode adicionar nota!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -125,18 +125,18 @@ msgstr "O código da equipa de vendas deve ser único!"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "Lead '%s' has been converted to an opportunity."
-msgstr ""
+msgstr "A dica '%s' foi convertida em oportunidade."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "A dica '%s' foi fechada."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Sem repetição"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -187,6 +187,8 @@ msgstr "Pesquisar oportunidades"
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
 msgstr ""
+"A oportunidade tem de ter um parceiro, antes de ser fundida com outra "
+"oportunidade."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -198,7 +200,7 @@ msgstr "Aviso!"
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "Impossível enviar correio!"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -225,14 +227,14 @@ msgstr "Terceiro"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "lanificador"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall2phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Agendar outra chamada"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:0
@@ -247,13 +249,13 @@ msgstr "Telefonema"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Opção saida"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "A oportunidade '%s' foi marcada como perdida"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -287,7 +289,7 @@ msgstr "Secções"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "_Merge"
-msgstr ""
+msgstr "_Fundir"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -307,7 +309,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Público"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -321,6 +323,8 @@ msgid ""
 "Create specific phone call categories to better sort the type of calls "
 "tracked in the system."
 msgstr ""
+"Crie categorias de telefonemas para melhor organizar as chamadas registadas "
+"no sistema."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
@@ -340,6 +344,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Se optar-saída está assinalado, este contato recusou receber emails ou "
+"desinscreveu-se de uma campanha."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -368,18 +374,18 @@ msgstr "Contacto"
 #. module: crm
 #: field:crm.case.stage,on_change:0
 msgid "Change Probability Automatically"
-msgstr ""
+msgstr "Mudar a probabilidade automaticamente"
 
 #. module: crm
 #: field:base.action.rule,regex_history:0
 msgid "Regular Expression on Case History"
-msgstr ""
+msgstr "Expressão regular no histórico de casos"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been opened."
-msgstr ""
+msgstr "A dica '%s' foi aberta"
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -390,7 +396,7 @@ msgstr "Oportunidade de uma reunião"
 #: help:crm.lead.report,delay_close:0
 #: help:crm.phonecall.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Número de dias para fechar o caso"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
@@ -406,12 +412,12 @@ msgstr "Angariação de fundos"
 #: view:res.partner:0
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr ""
+msgstr "Dicas e oportunidades"
 
 #. module: crm
 #: view:crm.send.mail:0
 msgid "_Send"
-msgstr ""
+msgstr "E_nviar"
 
 #. module: crm
 #: view:crm.lead:0
@@ -431,12 +437,12 @@ msgstr "Alterar o estado para"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_action
 msgid "Convert/Merge Opportunity"
-msgstr ""
+msgstr "Converter / fundir oportunidade"
 
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Atualizar data"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -447,7 +453,7 @@ msgstr ""
 #: view:crm.lead2opportunity.action:0
 #: field:crm.lead2opportunity.action,name:0
 msgid "Select Action"
-msgstr ""
+msgstr "Selecione ação"
 
 #. module: crm
 #: field:base.action.rule,trg_categ_id:0
@@ -465,7 +471,7 @@ msgstr "Categoria"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "#Opportunities"
-msgstr ""
+msgstr "#Oportunidades"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
@@ -485,17 +491,17 @@ msgstr "Privacidade"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Opportunity Analysis"
-msgstr ""
+msgstr "Aálise de oportunidades"
 
 #. module: crm
 #: help:crm.meeting,location:0
 msgid "Location of Event"
-msgstr ""
+msgstr "Local do evento"
 
 #. module: crm
 #: field:crm.meeting,rrule:0
 msgid "Recurrent Rule"
-msgstr ""
+msgstr "Regra recurrente"
 
 #. module: crm
 #: help:crm.installer,fetchmail:0
@@ -510,7 +516,7 @@ msgstr "Normal ou reunião telefonica por oportunidade"
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr ""
+msgstr "Primeiro contacto com nova prespeção"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -560,17 +566,17 @@ msgstr "Parado"
 #: view:crm.send.mail:0
 #: model:ir.actions.act_window,name:crm.action_crm_reply_mail
 msgid "Reply to last Mail"
-msgstr ""
+msgstr "responder ao último correio"
 
 #. module: crm
 #: field:crm.lead,email:0
 msgid "E-Mail"
-msgstr ""
+msgstr "Email"
 
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
 msgid "Sale FAQ"
-msgstr ""
+msgstr "Perguntas frequentes - vendas"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
@@ -580,7 +586,7 @@ msgstr "crm.send.mail.attachment"
 #. module: crm
 #: field:crm.meeting,count:0
 msgid "Count"
-msgstr ""
+msgstr "Contar"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -644,7 +650,7 @@ msgstr ""
 #. module: crm
 #: constraint:base.action.rule:0
 msgid "Error: The mail is not well formated"
-msgstr ""
+msgstr "Erro: A mensagem não está bem formatada"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -682,7 +688,7 @@ msgstr ""
 #: code:addons/crm/crm_meeting.py:0
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "A reunião '%s' foi confirmada."
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -705,7 +711,7 @@ msgstr ""
 #. module: crm
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Atividade corrente"
 
 #. module: crm
 #: help:crm.meeting,exrule:0
@@ -713,6 +719,8 @@ msgid ""
 "Defines a rule or repeating pattern of time to exclude from the recurring "
 "rule."
 msgstr ""
+"Define uma regra ou padrão de repetição de tempo para excluir da regra "
+"recorrente."
 
 #. module: crm
 #: view:crm.segmentation.line:0
@@ -725,6 +733,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the event "
 "alarm information without removing it."
 msgstr ""
+"Se o campo \"ativo\" é definido como verdadeiro, permite esconder a "
+"informação de alarme do evento sem remove-lo."
 
 #. module: crm
 #: view:crm.lead:0
@@ -737,7 +747,7 @@ msgstr "Detalhes"
 msgid ""
 "Helps you to synchronize the meetings with other calendar clients and "
 "mobiles."
-msgstr ""
+msgstr "Ajuda a sincronizar as reuniões com outros calendários e celulares."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
@@ -750,6 +760,8 @@ msgid ""
 "Manages the suppliers and customers claims, including your corrective or "
 "preventive actions."
 msgstr ""
+"Gere as reclamações dos fornecedores e clientes, incluindo as suas ações "
+"corretivas e preventivas."
 
 #. module: crm
 #: view:crm.lead:0
@@ -765,7 +777,7 @@ msgstr "Segmentação do terceiro"
 #. module: crm
 #: field:crm.lead.report,probable_revenue:0
 msgid "Probable Revenue"
-msgstr ""
+msgstr "Retorno provável"
 
 #. module: crm
 #: help:crm.segmentation,name:0
@@ -781,13 +793,13 @@ msgstr "Probabilidade (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Geração de dicas"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Painel estatístico"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -811,7 +823,7 @@ msgstr "Televisão"
 #. module: crm
 #: field:crm.installer,crm_caldav:0
 msgid "Calendar Synchronizing"
-msgstr ""
+msgstr "Sincronização do calendário"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -845,7 +857,7 @@ msgstr "Por dia"
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr ""
+msgstr "Definir equipa para"
 
 #. module: crm
 #: view:calendar.attendee:0
@@ -867,12 +879,12 @@ msgstr "Exclusivo"
 #: code:addons/crm/crm_opportunity.py:0
 #, python-format
 msgid "The opportunity '%s' has been won."
-msgstr ""
+msgstr "A oportunidade '%s' foi ganha."
 
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Definir um alarme neste momento, antes da ocorrência do evento"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -946,7 +958,7 @@ msgstr "Converter em oportunidade "
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Gives the sequence order when displaying a list of case stages."
-msgstr ""
+msgstr "Dá a ordem sequencial ao exibir uma lista de estágios de caso."
 
 #. module: crm
 #: view:crm.lead:0
@@ -966,7 +978,7 @@ msgstr "Categoria do Terceiro"
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Adicionar nota"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
@@ -981,7 +993,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Marcar como ganho"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -991,7 +1003,7 @@ msgstr "Montante de Compra"
 #. module: crm
 #: view:crm.lead:0
 msgid "Mark Lost"
-msgstr ""
+msgstr "Marcar como perdido"
 
 #. module: crm
 #: selection:crm.lead.report,month:0
@@ -1004,12 +1016,12 @@ msgstr "Março"
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The opportunity '%s' has been closed."
-msgstr ""
+msgstr "A oportunidade '%s' foi encerrada."
 
 #. module: crm
 #: field:crm.lead,day_open:0
 msgid "Days to Open"
-msgstr ""
+msgstr "Dias para abrir"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1040,11 +1052,12 @@ msgstr "Telemóvel"
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"Não há mais oportunidades 'Abertas' ou 'Pendentes' para o parceiro '%s'."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Next Stage"
-msgstr ""
+msgstr "Próximo estágio"
 
 #. module: crm
 #: view:board.board:0
@@ -1080,12 +1093,12 @@ msgstr "Reuniões"
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
 #, python-format
 msgid "Closed/Cancelled Leads Could not convert into Opportunity"
-msgstr ""
+msgstr "Dicas Cancelas/Encerradas não podem ser convertidas em oportunidades"
 
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Repetir até"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1108,6 +1121,7 @@ msgstr "_Cancelar"
 #, python-format
 msgid "Closed/Cancelled Phone Call Could not convert into Opportunity"
 msgstr ""
+"Chamadas Canceladas/Encerradas não podem ser convertidas em oportunidades"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1117,12 +1131,12 @@ msgstr "Segmentações do terceiro"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Anterior"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Estatísticas"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
@@ -1145,33 +1159,33 @@ msgstr ""
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Seguinte"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Stage:"
-msgstr ""
+msgstr "Estágio"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
 #: view:crm.lead:0
 msgid "Won"
-msgstr ""
+msgstr "Ganho"
 
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Prazo ultrapassado"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
 msgid "Sales Department"
-msgstr ""
+msgstr "Departamento de vendas"
 
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "Formatar como HTML?"
 
 #. module: crm
 #: field:crm.lead,type:0
@@ -1200,7 +1214,7 @@ msgstr "Mais Baixo"
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "Anexo"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1215,7 +1229,7 @@ msgstr "Data de Criação"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every x"
-msgstr ""
+msgstr "Repetir a cada x"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index a39a41dceab..6e29fda69ba 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 20:45+0000\n"
+"PO-Revision-Date: 2010-12-16 00:22+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/i18n/sv.po b/addons/crm/i18n/sv.po
index 21ffe9e779c..0c2e2640e86 100644
--- a/addons/crm/i18n/sv.po
+++ b/addons/crm/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-11 23:59+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 22:50+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -31,7 +31,7 @@ msgstr ""
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Need Services"
-msgstr ""
+msgstr "Behöver tjänster"
 
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
@@ -41,7 +41,7 @@ msgstr "Månadsvis"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Schedule a PhoneCall"
-msgstr ""
+msgstr "Schemalägg telefonsamtal"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
@@ -78,13 +78,13 @@ msgstr "Idag"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Opportunities"
-msgstr ""
+msgstr "Välj affärsmöjligheter"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid " "
-msgstr ""
+msgstr " "
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -95,13 +95,13 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Previous Stage"
-msgstr ""
+msgstr "Föregående status"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_add_note.py:0
 #, python-format
 msgid "Can not add note!"
-msgstr ""
+msgstr "Kan inte lägga till anteckning!"
 
 #. module: crm
 #: field:crm.case.stage,name:0
@@ -119,7 +119,7 @@ msgstr "Dag"
 #. module: crm
 #: sql_constraint:crm.case.section:0
 msgid "The code of the sales team must be unique !"
-msgstr ""
+msgstr "Koden för säljteamet måste vara unikt!"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -131,12 +131,12 @@ msgstr ""
 #: code:addons/crm/crm_lead.py:0
 #, python-format
 msgid "The lead '%s' has been closed."
-msgstr ""
+msgstr "Lead '%s' har stängts."
 
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "No Repeat"
-msgstr ""
+msgstr "Ingen repetition"
 
 #. module: crm
 #: field:crm.case.section,resource_calendar_id:0
@@ -154,7 +154,7 @@ msgstr "Varning !"
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Yearly"
-msgstr ""
+msgstr "Årligen"
 
 #. module: crm
 #: field:crm.segmentation.line,name:0
@@ -174,12 +174,12 @@ msgstr "Kampanj"
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
 msgid "Do not create a partner"
-msgstr ""
+msgstr "Skapa inte partner"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Search Opportunities"
-msgstr ""
+msgstr "Sök möjligheter"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -187,6 +187,8 @@ msgstr ""
 msgid ""
 "Opportunity must have Partner assigned before merging with other Opportunity."
 msgstr ""
+"En möjlighet måste ha en partner tilldelad innan den slås ihop med en annan "
+"möjlighet."
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -198,7 +200,7 @@ msgstr "Varning!"
 #: code:addons/crm/wizard/crm_send_email.py:0
 #, python-format
 msgid "Can not send mail!"
-msgstr ""
+msgstr "Kan inte skicka email!"
 
 #. module: crm
 #: field:crm.lead,partner_id:0
@@ -225,14 +227,14 @@ msgstr "Partner"
 #: field:crm.meeting,organizer:0
 #: field:crm.meeting,organizer_id:0
 msgid "Organizer"
-msgstr ""
+msgstr "Organisatör"
 
 #. module: crm
 #: view:crm.phonecall:0
 #: view:crm.phonecall2phonecall:0
 #: model:ir.actions.act_window,name:crm.phonecall_to_phonecall_act
 msgid "Schedule Other Call"
-msgstr ""
+msgstr "Schemalägg nytt samtal"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_opportunity_to_phonecall.py:0
@@ -253,7 +255,7 @@ msgstr ""
 #: code:addons/crm/crm_opportunity.py:0
 #, python-format
 msgid "The opportunity '%s' has been marked as lost."
-msgstr ""
+msgstr "Möjligheten '%s' har markerats som förlorad."
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -307,13 +309,13 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Publik"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
 #: model:ir.ui.menu,name:crm.menu_crm_case_resource_type_act
 msgid "Campaigns"
-msgstr ""
+msgstr "Kampanjer"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_phonecall_categ_action
@@ -356,7 +358,7 @@ msgstr "Kontaktnamn"
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing partner"
-msgstr ""
+msgstr "Länka till en befintlig partner"
 
 #. module: crm
 #: view:crm.lead:0
@@ -436,7 +438,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Uppdateringsdatum"
 
 #. module: crm
 #: help:crm.meeting,count:0
@@ -470,12 +472,12 @@ msgstr ""
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor2
 msgid "Campaign 1"
-msgstr ""
+msgstr "Kampanj 1"
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_oppor1
 msgid "Campaign 2"
-msgstr ""
+msgstr "Kampanj 2"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -505,7 +507,7 @@ msgstr ""
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
 msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Normalt eller telefonmöte för möjligheten"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
@@ -570,12 +572,12 @@ msgstr ""
 #. module: crm
 #: field:crm.installer,wiki_sale_faq:0
 msgid "Sale FAQ"
-msgstr ""
+msgstr "Försäljning FAQ"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_send_mail_attachment
 msgid "crm.send.mail.attachment"
-msgstr ""
+msgstr "crm.send.mail.attachment"
 
 #. module: crm
 #: field:crm.meeting,count:0
@@ -592,7 +594,7 @@ msgstr "Oktober"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr ""
+msgstr "Inkluderade svar :"
 
 #. module: crm
 #: help:crm.meeting,email_from:0
@@ -604,7 +606,7 @@ msgstr ""
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Summering"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -681,7 +683,7 @@ msgstr ""
 #: code:addons/crm/crm_meeting.py:0
 #, python-format
 msgid "The meeting '%s' has been confirmed."
-msgstr ""
+msgstr "Mötet '%s' har blivit konfirmerat."
 
 #. module: crm
 #: field:crm.case.section,user_id:0
@@ -729,7 +731,7 @@ msgstr ""
 #: view:crm.lead:0
 #: view:crm.meeting:0
 msgid "Details"
-msgstr ""
+msgstr "Detaljer"
 
 #. module: crm
 #: help:crm.installer,crm_caldav:0
@@ -741,7 +743,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Years"
-msgstr ""
+msgstr "År"
 
 #. module: crm
 #: help:crm.installer,crm_claim:0
@@ -805,7 +807,7 @@ msgstr "Tillfälle"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
 msgid "Television"
-msgstr ""
+msgstr "TV"
 
 #. module: crm
 #: field:crm.installer,crm_caldav:0
@@ -855,7 +857,7 @@ msgstr ""
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
 msgid "crm.installer"
-msgstr ""
+msgstr "crm.installer"
 
 #. module: crm
 #: field:crm.segmentation,exclusif:0
@@ -871,7 +873,7 @@ msgstr ""
 #. module: crm
 #: help:crm.meeting,alarm_id:0
 msgid "Set an alarm at this time, before the event occurs"
-msgstr ""
+msgstr "Sätt en påminnelse denna tid innan händelsen"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
@@ -912,7 +914,7 @@ msgstr ""
 #: field:crm.lead.report,create_date:0
 #: field:crm.phonecall.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Skapat datum"
 
 #. module: crm
 #: field:crm.lead,ref2:0
@@ -928,7 +930,7 @@ msgstr "Sales Purchase"
 #: view:crm.case.stage:0
 #: field:crm.case.stage,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Krav"
 
 #. module: crm
 #: help:crm.meeting,exdate:0
@@ -965,12 +967,12 @@ msgstr "Partner Category"
 #: view:crm.add.note:0
 #: model:ir.actions.act_window,name:crm.action_crm_add_note
 msgid "Add Note"
-msgstr ""
+msgstr "Lägg till anteckning"
 
 #. module: crm
 #: field:crm.lead,is_supplier_add:0
 msgid "Supplier"
-msgstr ""
+msgstr "Leverantör"
 
 #. module: crm
 #: help:crm.send.mail,reply_to:0
@@ -997,7 +999,7 @@ msgstr ""
 #: selection:crm.meeting,month_list:0
 #: selection:crm.phonecall.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1013,14 +1015,14 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Show time as"
-msgstr ""
+msgstr "Visa tid som"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
 #: view:crm.phonecall2partner:0
 #, python-format
 msgid "Create Partner"
-msgstr ""
+msgstr "Skapa partner"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1031,7 +1033,7 @@ msgstr "<"
 #: field:crm.lead,mobile:0
 #: field:crm.phonecall,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Mobil"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_merge_opportunities.py:0
@@ -1048,7 +1050,7 @@ msgstr ""
 #. module: crm
 #: view:board.board:0
 msgid "My Meetings"
-msgstr ""
+msgstr "Mina möten"
 
 #. module: crm
 #: field:crm.lead,ref:0
@@ -1073,7 +1075,7 @@ msgstr ""
 #: field:res.partner,meeting_ids:0
 #, python-format
 msgid "Meetings"
-msgstr ""
+msgstr "Möten"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -1084,7 +1086,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,end_date:0
 msgid "Repeat Until"
-msgstr ""
+msgstr "Repetera tills"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1116,17 +1118,17 @@ msgstr "Partner Segmentations"
 #. module: crm
 #: view:res.partner:0
 msgid "Previous"
-msgstr ""
+msgstr "Föregående"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistik"
 
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Deltagare"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_leads_all
@@ -1144,7 +1146,7 @@ msgstr ""
 #: view:crm.lead2opportunity.action:0
 #: view:res.partner:0
 msgid "Next"
-msgstr ""
+msgstr "Nästa"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1199,7 +1201,7 @@ msgstr "Lowest"
 #: view:crm.send.mail:0
 #: field:crm.send.mail.attachment,binary:0
 msgid "Attachment"
-msgstr ""
+msgstr "Bilaga"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1214,7 +1216,7 @@ msgstr "Creation Date"
 #. module: crm
 #: help:crm.meeting,interval:0
 msgid "Repeat every x"
-msgstr ""
+msgstr "Repetera varje x"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
@@ -1232,12 +1234,12 @@ msgstr ""
 #: field:crm.send.mail,subject:0
 #: view:res.partner:0
 msgid "Subject"
-msgstr ""
+msgstr "Ämne"
 
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Tis"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1268,7 +1270,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,class:0
 msgid "Mark as"
-msgstr ""
+msgstr "Markera som"
 
 #. module: crm
 #: help:crm.meeting,rrule_type:0
@@ -1355,17 +1357,17 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  År  "
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Edit All"
-msgstr ""
+msgstr "Editera alla"
 
 #. module: crm
 #: field:crm.meeting,fr:0
 msgid "Fri"
-msgstr ""
+msgstr "Fre"
 
 #. module: crm
 #: field:crm.meeting,write_date:0
@@ -1375,7 +1377,7 @@ msgstr ""
 #. module: crm
 #: view:crm.meeting:0
 msgid "Reminder"
-msgstr ""
+msgstr "Påminnelse"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1394,7 +1396,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:crm.action_crm_lead2partner
 #: model:ir.actions.act_window,name:crm.action_crm_phonecall2partner
 msgid "Create a Partner"
-msgstr ""
+msgstr "Skapa en partner"
 
 #. module: crm
 #: field:crm.segmentation,state:0
@@ -1404,7 +1406,7 @@ msgstr "Execution Status"
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Monday"
-msgstr ""
+msgstr "Måndag"
 
 #. module: crm
 #: field:crm.lead,day_close:0
@@ -1416,7 +1418,7 @@ msgstr ""
 #: field:crm.case.section,complete_name:0
 #: field:crm.send.mail,attachment_ids:0
 msgid "unknown"
-msgstr ""
+msgstr "okänd"
 
 #. module: crm
 #: field:crm.lead,id:0
@@ -1447,7 +1449,7 @@ msgstr "Datum"
 #: view:crm.meeting:0
 #: view:crm.phonecall.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Utökat filter..."
 
 #. module: crm
 #: field:crm.phonecall2opportunity,name:0
@@ -1457,7 +1459,7 @@ msgstr ""
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Search"
-msgstr ""
+msgstr "Sök"
 
 #. module: crm
 #: view:board.board:0
@@ -1467,7 +1469,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Intervall"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1483,7 +1485,7 @@ msgstr "History"
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kod"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1511,7 +1513,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,freq:0
 msgid "Frequency"
-msgstr ""
+msgstr "Frekvens"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1536,7 +1538,7 @@ msgstr "Cancel"
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1546,14 +1548,14 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,rrule_type:0
 msgid "Custom"
-msgstr ""
+msgstr "Anpassad"
 
 #. module: crm
 #: view:crm.lead:0
 #: view:crm.meeting:0
 #: view:crm.phonecall:0
 msgid "Current"
-msgstr ""
+msgstr "Nuvarande"
 
 #. module: crm
 #: field:crm.meeting,exrule:0
@@ -1604,7 +1606,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Obekräftad"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1638,7 +1640,7 @@ msgstr ""
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Larm"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1649,7 +1651,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead,birthdate:0
 msgid "Birthdate"
-msgstr ""
+msgstr "Födelsedag"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1659,7 +1661,7 @@ msgstr ""
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
 msgid "Wizard"
-msgstr ""
+msgstr "Guide"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1685,7 +1687,7 @@ msgstr "Hög"
 #. module: crm
 #: selection:crm.meeting,freq:0
 msgid "Seconds"
-msgstr ""
+msgstr "Sekunder"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_partner0
@@ -1700,12 +1702,12 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,week_list:0
 msgid "Saturday"
-msgstr ""
+msgstr "Lördag"
 
 #. module: crm
 #: selection:crm.meeting,byday:0
 msgid "Fifth"
-msgstr ""
+msgstr "Femte"
 
 #. module: crm
 #: view:crm.phonecall2phonecall:0
@@ -1720,7 +1722,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,we:0
 msgid "Wed"
-msgstr ""
+msgstr "Ons"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
@@ -1739,7 +1741,7 @@ msgstr "Planned Revenue"
 #: view:crm.phonecall:0
 #: view:crm.phonecall.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Gruppera på..."
 
 #. module: crm
 #: help:crm.lead,partner_id:0
@@ -1774,7 +1776,7 @@ msgstr "Hours"
 #. module: crm
 #: field:crm.lead,zip:0
 msgid "Zip"
-msgstr ""
+msgstr "Postnummer"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:0
@@ -1785,14 +1787,14 @@ msgstr ""
 #. module: crm
 #: view:crm.installer:0
 msgid "title"
-msgstr ""
+msgstr "titel"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_phone1
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Inkommande"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -1805,7 +1807,7 @@ msgstr ""
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr ""
+msgstr "Telefonsamtal"
 
 #. module: crm
 #: selection:crm.meeting,show_as:0
@@ -1815,7 +1817,7 @@ msgstr ""
 #. module: crm
 #: view:crm.installer:0
 msgid "Synchronization"
-msgstr ""
+msgstr "Synkronisering"
 
 #. module: crm
 #: field:crm.case.section,allow_unlink:0
@@ -1825,7 +1827,7 @@ msgstr "Tillåt makulering"
 #. module: crm
 #: field:crm.meeting,mo:0
 msgid "Mon"
-msgstr ""
+msgstr "Mån"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1840,7 +1842,7 @@ msgstr "Highest"
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr ""
+msgstr "Anteckningar"
 
 #. module: crm
 #: selection:crm.meeting,freq:0
diff --git a/addons/crm/i18n/vi.po b/addons/crm/i18n/vi.po
index c017bca6837..ddfa558c559 100644
--- a/addons/crm/i18n/vi.po
+++ b/addons/crm/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 13:51+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 11:37+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm/report/report_businessopp.py b/addons/crm/report/report_businessopp.py
index 07751622abe..4ebdd3cc81a 100644
--- a/addons/crm/report/report_businessopp.py
+++ b/addons/crm/report/report_businessopp.py
@@ -52,7 +52,7 @@ class report_custom(report_int):
 
     """ Create Custom Report """
 
-    def create(self, cr, uid, ids, datas, context={}):
+    def create(self, cr, uid, ids, datas, context=None):
 
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
diff --git a/addons/crm/wizard/crm_add_note.py b/addons/crm/wizard/crm_add_note.py
index 6bdf472cd97..3c57156a23f 100644
--- a/addons/crm/wizard/crm_add_note.py
+++ b/addons/crm/wizard/crm_add_note.py
@@ -19,7 +19,7 @@ class crm_add_note(osv.osv_memory):
     }
 
     def action_add(self, cr, uid, ids, context=None):
-        if not context:
+        if context is None:
             context = {}
 
         if not context.get('active_model'):
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 852a8043623..e94ac30c605 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -124,9 +124,11 @@ class crm_lead2opportunity(osv.osv_memory):
         @param context: A standard dictionary for contextual values
 
         """
+        if context is None:
+            context = {}
         lead_obj = self.pool.get('crm.lead')
 
-        for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
+        for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
 Leads Could not convert into Opportunity"))
@@ -177,10 +179,10 @@ class crm_lead2opportunity_partner(osv.osv_memory):
 
         @return : Dictionary value for created Partner form.
         """
-        if not context:
+        if context is None:
             context = {}
 
-        partner_ids = self._create_partner(cr, uid, ids, context)
+        partner_ids = self._create_partner(cr, uid, ids, context=context)
         value = {}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_action')
@@ -214,6 +216,8 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         @return : Dictionary value for Opportunity form
         """
         value = {}
+        if context is None:
+            context = {}
         data_obj = self.pool.get('ir.model.data')
         data_id = data_obj._get_id(cr, uid, 'crm', 'view_crm_lead2opportunity_create')
         view_id = False
@@ -245,9 +249,11 @@ class crm_lead2opportunity_partner(osv.osv_memory):
         @param context: A standard dictionary for contextual values
 
         """
+        if context is None:
+            context = {}
         lead_obj = self.pool.get('crm.lead')
 
-        for lead in lead_obj.browse(cr, uid, context.get('active_ids', [])):
+        for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if lead.state in ['done', 'cancel']:
                 raise osv.except_osv(_("Warning !"), _("Closed/Cancelled \
 Leads Could not convert into Opportunity"))
@@ -278,6 +284,8 @@ class crm_lead2opportunity_action(osv.osv_memory):
         @return : Dictionary value for Opportunity form
         """
         value = {}
+        if context is None:
+            context = {}
         data_obj = self.pool.get('ir.model.data')
         view_id = False
         for this in self.browse(cr, uid, ids, context=context):
diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py
index 80cb4ecf69f..08e75874d67 100644
--- a/addons/crm/wizard/crm_lead_to_partner.py
+++ b/addons/crm/wizard/crm_lead_to_partner.py
@@ -135,7 +135,7 @@ class crm_lead2partner(osv.osv_memory):
 
         @return : Dictionary value for next form.
         """
-        if not context:
+        if context is None:
             context = {}
 
         view_obj = self.pool.get('ir.ui.view')
@@ -163,7 +163,7 @@ class crm_lead2partner(osv.osv_memory):
 
         @return : Dictionary {}.
         """
-        if not context:
+        if context is None:
             context = {}
 
         lead_obj = self.pool.get('crm.lead')
@@ -174,8 +174,8 @@ class crm_lead2partner(osv.osv_memory):
         contact_id = False
         rec_ids = context and context.get('active_ids', [])
 
-        for data in self.browse(cr, uid, ids):
-            for lead in lead_obj.browse(cr, uid, rec_ids):
+        for data in self.browse(cr, uid, ids, context=context):
+            for lead in lead_obj.browse(cr, uid, rec_ids, context=context):
                 if data.action == 'create':
                     partner_id = partner_obj.create(cr, uid, {
                         'name': lead.partner_name or lead.contact_name or lead.name,
@@ -226,10 +226,10 @@ class crm_lead2partner(osv.osv_memory):
 
         @return : Dictionary value for created Partner form.
         """
-        if not context:
+        if context is None:
             context = {}
 
-        partner_ids = self._create_partner(cr, uid, ids, context)
+        partner_ids = self._create_partner(cr, uid, ids, context=context)
         mod_obj = self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py
index 84da9ea0613..bbede21a682 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity.py
+++ b/addons/crm/wizard/crm_partner_to_opportunity.py
@@ -57,7 +57,7 @@ class crm_partner2opportunity(osv.osv_memory):
                 res.update({'partner_id': data and data[0] or False})
         return res
 
-    def make_opportunity(self, cr, uid, ids, context):
+    def make_opportunity(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -67,7 +67,7 @@ class crm_partner2opportunity(osv.osv_memory):
 
         data = context and context.get('active_ids', []) or []
         make_opportunity = self.pool.get('crm.partner2opportunity')
-        for make_opportunity_obj in make_opportunity.browse(cr,uid,ids):
+        for make_opportunity_obj in make_opportunity.browse(cr, uid, ids, context=context):
             data_obj = self.pool.get('ir.model.data')
             result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
             res = data_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/crm/wizard/crm_phonecall_to_meeting.py b/addons/crm/wizard/crm_phonecall_to_meeting.py
index bf63c319a71..3f726af15ef 100644
--- a/addons/crm/wizard/crm_phonecall_to_meeting.py
+++ b/addons/crm/wizard/crm_phonecall_to_meeting.py
@@ -31,7 +31,7 @@ import pooler
 
 class phonecall2meeting(wizard.interface):
 
-    def _makeMeeting(self, cr, uid, data, context):
+    def _makeMeeting(self, cr, uid, data, context=None):
         pool = pooler.get_pool(cr.dbname)
         phonecall_case_obj = pool.get('crm.phonecall')                   
         data_obj = pool.get('ir.model.data')
diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py
index 5dbef42b50f..38e673108e4 100644
--- a/addons/crm/wizard/crm_phonecall_to_partner.py
+++ b/addons/crm/wizard/crm_phonecall_to_partner.py
@@ -63,7 +63,7 @@ class crm_phonecall2partner(osv.osv_memory):
 
         @return : Partner id if any for selected phonecall.
         """
-        if not context:
+        if context is None:
             context = {}
 
         phonecall_obj = self.pool.get('crm.phonecall')
@@ -99,8 +99,6 @@ class crm_phonecall2partner(osv.osv_memory):
 
         @return : Dictionary value for next form.
         """
-        if not context:
-            context = {}
 
         view_obj = self.pool.get('ir.ui.view')
         view_id = view_obj.search(cr, uid, [('model', '=', 'crm.phonecall2partner'), \
@@ -127,7 +125,7 @@ class crm_phonecall2partner(osv.osv_memory):
 
         @return : Dictionary {}.
         """
-        if not context:
+        if context is None:
             context = {}
 
         phonecall_obj = self.pool.get('crm.phonecall')
@@ -138,8 +136,8 @@ class crm_phonecall2partner(osv.osv_memory):
 
         rec_ids = context and context.get('active_ids', [])
 
-        for data in self.browse(cr, uid, ids):
-            for phonecall in phonecall_obj.browse(cr, uid, rec_ids):
+        for data in self.browse(cr, uid, ids, context=context):
+            for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context):
                 if data.action == 'create':
                     partner_id = partner_obj.create(cr, uid, {
                         'name': phonecall.name or phonecall.name,
@@ -178,10 +176,8 @@ class crm_phonecall2partner(osv.osv_memory):
 
         @return : Dictionary value for created Partner form.
         """
-        if not context:
-            context = {}
 
-        partner_ids = self._create_partner(cr, uid, ids, context)
+        partner_ids = self._create_partner(cr, uid, ids, context=context)
         mod_obj = self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'base', 'view_res_partner_filter')
         res = mod_obj.read(cr, uid, result, ['res_id'])
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index bd090c041b5..eeb635b7c3b 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -65,7 +65,7 @@ class crm_send_new_email(osv.osv_memory):
         """
         hist_obj = self.pool.get('mailgate.message')
 
-        if not context:
+        if context is None:
             context = {}
 
         if not context.get('active_model'):
@@ -162,7 +162,7 @@ class crm_send_new_email(osv.osv_memory):
         """
         This function gets default values
         """
-        if not context:
+        if context is None:
             context = {}
 
         if not context.get('active_model'):
@@ -181,7 +181,7 @@ class crm_send_new_email(osv.osv_memory):
         user_obj = self.pool.get('res.users')
         user_mail_from = user_obj._get_email_from(cr, uid, [uid], context=context)[uid]
 
-        for case in mod_obj.browse(cr, uid, res_id):
+        for case in mod_obj.browse(cr, uid, res_id, context=context):
             if 'email_to' in fields:
                 res.update({'email_to': case.email_from and tools.ustr(case.email_from) or ''})
             if 'email_from' in fields:
@@ -263,7 +263,7 @@ class crm_send_new_email(osv.osv_memory):
         @param context: A standard dictionary for contextual values
 
         """
-        if not context:
+        if context is None:
             context = {}
 
         if not context.get('active_model'):
diff --git a/addons/crm/wizard/wizard_history_event.py b/addons/crm/wizard/wizard_history_event.py
index 50f30e12f90..b71ee0d6cd0 100644
--- a/addons/crm/wizard/wizard_history_event.py
+++ b/addons/crm/wizard/wizard_history_event.py
@@ -24,7 +24,7 @@ import wizard
 import pooler
 import time
 
-def _open_history_event(self, cr, uid, data, context): 
+def _open_history_event(self, cr, uid, data, context=None):
     pool = pooler.get_pool(cr.dbname)
     data_obj = pool.get('ir.model.data')
     result = data_obj._get_id(cr, uid, 'crm', 'view_crm_case_filter')
@@ -35,7 +35,7 @@ def _open_history_event(self, cr, uid, data, context):
     res = ''    
     if data.get('model',False) and data.get('ids',False):           
         model_obj = pooler.get_pool(cr.dbname).get(data['model'])
-        res = model_obj.browse(cr,uid,data['ids'])
+        res = model_obj.browse(cr, uid, data['ids'], context=context)
         if len(res):
             res = res[0].name       
     return {
diff --git a/addons/crm_caldav/crm_caldav.py b/addons/crm_caldav/crm_caldav.py
index c2ed193dc23..8ba59909143 100644
--- a/addons/crm_caldav/crm_caldav.py
+++ b/addons/crm_caldav/crm_caldav.py
@@ -36,8 +36,7 @@ class crm_meeting(osv.osv):
             @param ids: List of CRM Meeting’s IDs
             @param context: A standard dictionary for contextual values
         """
-        if not context:
-            context = {}
+        if context is None: context = {}
         ids = map(lambda x: base_calendar.base_calendar_id2real_id(x), ids)
         event_data = self.read(cr, uid, ids, context=context)
         event_obj = self.pool.get('basic.calendar.event')
@@ -54,8 +53,6 @@ class crm_meeting(osv.osv):
             @param data_id: calendar's Id
             @param context: A standard dictionary for contextual values
         """
-        if not context:
-            context = {}
         event_obj = self.pool.get('basic.calendar.event')
         vals = event_obj.import_cal(cr, uid, data, context=context)
         return self.check_import(cr, uid, vals, context=context)
@@ -68,7 +65,7 @@ class crm_meeting(osv.osv):
             @param vals: Get Values
             @param context: A standard dictionary for contextual values
         """
-        if not context:
+        if context is None:
             context = {}
         ids = []
         model_obj = self.pool.get(context.get('model'))
diff --git a/addons/crm_caldav/i18n/crm_caldav.pot b/addons/crm_caldav/i18n/crm_caldav.pot
index b62526a1a30..b629309e45d 100644
--- a/addons/crm_caldav/i18n/crm_caldav.pot
+++ b/addons/crm_caldav/i18n/crm_caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:24+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:24+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:10+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm_claim/i18n/crm_claim.pot b/addons/crm_claim/i18n/crm_claim.pot
index 36d0d2f458d..ca6f9393337 100644
--- a/addons/crm_claim/i18n/crm_claim.pot
+++ b/addons/crm_claim/i18n/crm_claim.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:25+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:25+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:11+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm_claim/i18n/de.po b/addons/crm_claim/i18n/de.po
index fb9be98805e..1ae10d0f6fd 100644
--- a/addons/crm_claim/i18n/de.po
+++ b/addons/crm_claim/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 22:21+0000\n"
+"PO-Revision-Date: 2010-12-15 13:01+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_claim
diff --git a/addons/crm_fundraising/i18n/crm_fundraising.pot b/addons/crm_fundraising/i18n/crm_fundraising.pot
index 5684a15ed9c..13e5aab109f 100644
--- a/addons/crm_fundraising/i18n/crm_fundraising.pot
+++ b/addons/crm_fundraising/i18n/crm_fundraising.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:26+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:12+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm_fundraising/i18n/sv.po b/addons/crm_fundraising/i18n/sv.po
index 260c4e6942f..d4edc3bd9fe 100644
--- a/addons/crm_fundraising/i18n/sv.po
+++ b/addons/crm_fundraising/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 21:33+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 06:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
diff --git a/addons/crm_helpdesk/i18n/crm_helpdesk.pot b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
index 8cc661b581b..85a94847ac0 100644
--- a/addons/crm_helpdesk/i18n/crm_helpdesk.pot
+++ b/addons/crm_helpdesk/i18n/crm_helpdesk.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:26+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:12+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm_helpdesk/i18n/de.po b/addons/crm_helpdesk/i18n/de.po
index a761ce1a154..a81c0d8a3eb 100644
--- a/addons/crm_helpdesk/i18n/de.po
+++ b/addons/crm_helpdesk/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 17:07+0000\n"
+"PO-Revision-Date: 2010-12-15 12:54+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_helpdesk
diff --git a/addons/crm_partner_assign/i18n/crm_partner_assign.pot b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
index 286ec2445f1..098b5ce8de0 100644
--- a/addons/crm_partner_assign/i18n/crm_partner_assign.pot
+++ b/addons/crm_partner_assign/i18n/crm_partner_assign.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:27+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:27+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:13+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm_partner_assign/i18n/pt.po b/addons/crm_partner_assign/i18n/pt.po
index fdf5843753f..bdf42419f9a 100644
--- a/addons/crm_partner_assign/i18n/pt.po
+++ b/addons/crm_partner_assign/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-15 00:15+0000\n"
+"PO-Revision-Date: 2010-12-15 20:47+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_partner_assign
diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py
index ab794cba468..bc3a9795834 100644
--- a/addons/crm_partner_assign/partner_geo_assign.py
+++ b/addons/crm_partner_assign/partner_geo_assign.py
@@ -94,7 +94,7 @@ class crm_lead(osv.osv):
         'partner_assigned_id': fields.many2one('res.partner', 'Assigned Partner', help="Partner this case has been forwarded/assigned to.", select=True),
         'date_assign': fields.date('Assignation Date', help="Last date this case was forwarded/assigned to a partner"),
     }
-    def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context={}):
+    def onchange_assign_id(self, cr, uid, ids, partner_assigned_id, context=None):
         """This function updates the "assignation date" automatically, when manually assign a partner in the geo assign tab
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
diff --git a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
index d14759dc3a7..fdb7acff35c 100644
--- a/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
+++ b/addons/crm_partner_assign/wizard/crm_forward_to_partner.py
@@ -169,7 +169,8 @@ class crm_lead_forward_to_partner(osv.osv_memory):
         """
         Forward the lead to a partner
         """
-        
+        if context is None:
+            context = {}
         this = self.browse(cr, uid, ids[0], context=context)
         case_pool = self.pool.get(context.get('active_model'))
         res_id = context and context.get('active_id', False) or False
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index e5165f5b186..90dc0818743 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -159,14 +159,14 @@ class questionnaire(osv.osv):
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
 
-    def build_form(self, cr, uid, data, context):
+    def build_form(self, cr, uid, data, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param data: Get Data
             @param context: A standard dictionary for contextual values """
-
+        
         query = """
         select name, id
         from crm_profiling_question
@@ -210,7 +210,7 @@ class partner(osv.osv):
                                 "partner","answer","Answers"),
         }
 
-    def _questionnaire_compute(self, cr, uid, data, context):
+    def _questionnaire_compute(self, cr, uid, data, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
@@ -228,7 +228,7 @@ class partner(osv.osv):
         for x in cr.fetchall():
             temp.append(x[0])
 
-        self.write(cr, uid, [data['id']], {'answers_ids':[[6, 0, temp]]}, context)
+        self.write(cr, uid, [data['id']], {'answers_ids':[[6, 0, temp]]}, context=context)
         return {}
 
 
@@ -240,8 +240,6 @@ class partner(osv.osv):
             @param ids: List of crm profiling’s IDs
             @param context: A standard dictionary for contextual values """
 
-        if not context:
-            context={}
         if 'answers_ids' in vals:
             vals['category_id']=[[6, 0, _recompute_categ(self, cr, uid, ids[0], vals['answers_ids'][0][2])]]
         return super(partner, self).write(cr, uid, ids, vals, context=context)
diff --git a/addons/crm_profiling/i18n/crm_profiling.pot b/addons/crm_profiling/i18n/crm_profiling.pot
index d672e8cfed6..1ab93187a76 100644
--- a/addons/crm_profiling/i18n/crm_profiling.pot
+++ b/addons/crm_profiling/i18n/crm_profiling.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:27+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:27+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:13+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/crm_profiling/i18n/de.po b/addons/crm_profiling/i18n/de.po
index e232bff55dc..2b599558cc1 100644
--- a/addons/crm_profiling/i18n/de.po
+++ b/addons/crm_profiling/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 21:35+0000\n"
+"PO-Revision-Date: 2010-12-15 12:01+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/crm_profiling/i18n/fr.po b/addons/crm_profiling/i18n/fr.po
index 2fe6c0d9f69..7979b1c3f67 100644
--- a/addons/crm_profiling/i18n/fr.po
+++ b/addons/crm_profiling/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-15 01:47+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-15 20:36+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
@@ -56,7 +57,7 @@ msgstr "Erreur ! Vous e pouvez pas créer de membres associés récursifs."
 #. module: crm_profiling
 #: view:crm.segmentation:0
 msgid "Partner Segmentations"
-msgstr "Segmentation partenaire"
+msgstr "Segmentations des partenaires"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -72,7 +73,7 @@ msgstr "Segmentation de partenaire"
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
-msgstr "Analyse"
+msgstr "Profilage"
 
 #. module: crm_profiling
 #: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
@@ -113,7 +114,7 @@ msgstr "Utiliser un Questionnaire"
 #: model:ir.actions.act_window,name:crm_profiling.open_questionnaires
 #: model:ir.ui.menu,name:crm_profiling.menu_segm_questionnaire
 msgid "Questionnaires"
-msgstr "Questionnaire"
+msgstr "Questionnaires"
 
 #. module: crm_profiling
 #: help:crm.segmentation,profiling_active:0
diff --git a/addons/crm_profiling/i18n/pt.po b/addons/crm_profiling/i18n/pt.po
index 6442089bb75..73a9fc568a5 100644
--- a/addons/crm_profiling/i18n/pt.po
+++ b/addons/crm_profiling/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 18:03+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 13:26+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
diff --git a/addons/decimal_precision/i18n/decimal_precision.pot b/addons/decimal_precision/i18n/decimal_precision.pot
index 2448acf10d2..0d4cc30fbad 100644
--- a/addons/decimal_precision/i18n/decimal_precision.pot
+++ b/addons/decimal_precision/i18n/decimal_precision.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:28+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:14+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/decimal_precision/i18n/fr.po b/addons/decimal_precision/i18n/fr.po
index f082279d645..0dd8e20c2d3 100644
--- a/addons/decimal_precision/i18n/fr.po
+++ b/addons/decimal_precision/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 08:43+0000\n"
+"PO-Revision-Date: 2010-12-15 20:38+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
@@ -41,7 +41,7 @@ msgstr "Utilisation"
 #. module: decimal_precision
 #: sql_constraint:decimal.precision:0
 msgid "Only one value can be defined for each given usage!"
-msgstr ""
+msgstr "Une seule valeur peut être définie pour chaque usage !"
 
 #. module: decimal_precision
 #: view:decimal.precision:0
diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index 4ac69d95679..aceee36e0a2 100644
--- 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
 
diff --git a/addons/delivery/i18n/delivery.pot b/addons/delivery/i18n/delivery.pot
index ec249104fac..910f6b6c743 100644
--- a/addons/delivery/i18n/delivery.pot
+++ b/addons/delivery/i18n/delivery.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:28+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:15+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/delivery/i18n/vi.po b/addons/delivery/i18n/vi.po
index 45e8d71300f..c88534186b4 100644
--- a/addons/delivery/i18n/vi.po
+++ b/addons/delivery/i18n/vi.po
@@ -1,20 +1,20 @@
 # Vietnamese translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-02 14:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 15:17+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py
index 23cc1563cff..d1ffb7ba968 100644
--- a/addons/delivery/stock.py
+++ b/addons/delivery/stock.py
@@ -31,7 +31,7 @@ class stock_picking(osv.osv):
     def _cal_weight(self, cr, uid, ids, name, args, context=None):
         res = {}
         uom_obj = self.pool.get('product.uom')
-        for picking in self.browse(cr, uid, ids, context):
+        for picking in self.browse(cr, uid, ids, context=context):
             total_weight = total_weight_net = 0.00
 
             for move in picking.move_lines:
@@ -75,7 +75,7 @@ class stock_picking(osv.osv):
         carrier_obj = self.pool.get('delivery.carrier')
         grid_obj = self.pool.get('delivery.grid')
         invoice_line_obj = self.pool.get('account.invoice.line')
-
+        
         result = super(stock_picking, self).action_invoice_create(cursor, user,
                 ids, journal_id=journal_id, group=group, type=type,
                 context=context)
@@ -138,7 +138,7 @@ class stock_move(osv.osv):
     def _cal_move_weight(self, cr, uid, ids, name, args, context=None):
         res = {}
         uom_obj = self.pool.get('product.uom')
-        for move in self.browse(cr, uid, ids, context):
+        for move in self.browse(cr, uid, ids, context=context):
             weight = weight_net = 0.00
             if move.product_id.weight > 0.00:
                 converted_qty = move.product_qty
diff --git a/addons/delivery/wizard/delivery_sale_order.py b/addons/delivery/wizard/delivery_sale_order.py
index 5f066b23bb0..f20426bbc35 100644
--- a/addons/delivery/wizard/delivery_sale_order.py
+++ b/addons/delivery/wizard/delivery_sale_order.py
@@ -34,7 +34,7 @@ class make_delivery(osv.osv_memory):
     }
 
 
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ 
              To get default values for the object.
             
@@ -46,10 +46,10 @@ class make_delivery(osv.osv_memory):
              
              @return: A dictionary which of fields with values. 
         
-        """        
+        """
         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', [])):
+        for order in order_obj.browse(cr, uid, context.get('active_ids', []), context=context):
              carrier = order.carrier_id.id
              if not carrier:
                   carrier = order.partner_id.property_delivery_carrier.id
@@ -58,13 +58,15 @@ class make_delivery(osv.osv_memory):
         return res
     
     def view_init(self, cr , uid , fields, context=None):
+         if context is None:
+            context = {}
          order_obj = self.pool.get('sale.order')
-         for order in order_obj.browse(cr, uid, context.get('active_ids', [])):     
+         for order in order_obj.browse(cr, uid, context.get('active_ids', []), context=context):     
              if not order.state in ('draft'):
                  raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
          pass     
         
-    def delivery_set(self, cr, uid, ids, context):
+    def delivery_set(self, cr, uid, ids, context=None):
         """ 
              Adds delivery costs to Sale Order Line.
             
@@ -77,14 +79,16 @@ class make_delivery(osv.osv_memory):
              @return:  
         
         """
+        if context is None:
+            context = {}
         rec_ids = context and context.get('active_ids',[])
         order_obj = self.pool.get('sale.order')
         line_obj = self.pool.get('sale.order.line')
         grid_obj = self.pool.get('delivery.grid')
         carrier_obj = self.pool.get('delivery.carrier')
         acc_fp_obj = self.pool.get('account.fiscal.position')
-        order_objs = order_obj.browse(cr, uid, rec_ids, context)
-        for datas in self.browse(cr, uid, ids):    
+        order_objs = order_obj.browse(cr, uid, rec_ids, context=context)
+        for datas in self.browse(cr, uid, ids, context=context):    
             for order in order_objs:
                 grid_id = carrier_obj.grid_get(cr, uid, [datas.carrier_id.id],order.partner_shipping_id.id)
                 if not grid_id:
@@ -93,7 +97,7 @@ class make_delivery(osv.osv_memory):
                 if not order.state in ('draft'):
                     raise osv.except_osv(_('Order not in draft state !'), _('The order state have to be draft to add delivery lines.'))
                 
-                grid = grid_obj.browse(cr, uid, grid_id)
+                grid = grid_obj.browse(cr, uid, grid_id, context=context)
         
                 taxes = grid.carrier_id.product_id.taxes_id
                 fpos = order.fiscal_position or False
diff --git a/addons/document/directory_content.py b/addons/document/directory_content.py
index 685df7910f3..e690e50d4b4 100644
--- a/addons/document/directory_content.py
+++ b/addons/document/directory_content.py
@@ -44,7 +44,7 @@ class document_directory_content(osv.osv):
     _name = 'document.directory.content'
     _description = 'Directory Content'
     _order = "sequence"
-    def _extension_get(self, cr, uid, context={}):
+    def _extension_get(self, cr, uid, context=None):
         cr.execute('select code,name from document_directory_content_type where active')
         res = cr.fetchall()
         return res
@@ -112,7 +112,7 @@ class document_directory_content(osv.osv):
     def process_read(self, cr, uid, node, context=None):
         if node.extension != '.pdf':
             raise Exception("Invalid content: %s" % node.extension)
-        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id)
+        report = self.pool.get('ir.actions.report.xml').browse(cr, uid, node.report_id, context=context)
         srv = netsvc.Service._services['report.'+report.report_name]
         ctx = node.context.context.copy()
         ctx.update(node.dctx)
diff --git a/addons/document/directory_report.py b/addons/document/directory_report.py
index 88a95a1705b..6eb18dae850 100644
--- a/addons/document/directory_report.py
+++ b/addons/document/directory_report.py
@@ -26,7 +26,7 @@ class ir_action_report_xml(osv.osv):
     _name="ir.actions.report.xml"
     _inherit ="ir.actions.report.xml"
 
-    def _model_get(self, cr, uid, ids, name, arg, context):
+    def _model_get(self, cr, uid, ids, name, arg, context=None):
         res = {}
         model_pool = self.pool.get('ir.model')
         for data in self.read(cr, uid, ids, ['model']):
@@ -39,7 +39,7 @@ class ir_action_report_xml(osv.osv):
                     res[data.get('id')] = False
         return res
 
-    def _model_search(self, cr, uid, obj, name, args, context={}):
+    def _model_search(self, cr, uid, obj, name, args, context=None):
         if not len(args):
             return []
         model_id= args[0][2]
diff --git a/addons/document/document.py b/addons/document/document.py
index e3d810668b4..7e575f38a37 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -38,7 +38,9 @@ class document_file(osv.osv):
     def _get_filestore(self, cr):
         return os.path.join(DMS_ROOT_PATH, cr.dbname)
 
-    def _data_get(self, cr, uid, ids, name, arg, context):
+    def _data_get(self, cr, uid, ids, name, arg, context=None):
+        if context is None:
+            context = {}
         fbrl = self.browse(cr, uid, ids, context=context)
         nctx = nodes.get_node_context(cr, uid, context={})
         # nctx will /not/ inherit the caller's context. Most of
@@ -59,7 +61,7 @@ class document_file(osv.osv):
     #
     # This code can be improved
     #
-    def _data_set(self, cr, uid, id, name, value, arg, context):
+    def _data_set(self, cr, uid, id, name, value, arg, context=None):
         if not value:
             return True
         fbro = self.browse(cr, uid, id, context=context)
@@ -139,7 +141,7 @@ class document_file(osv.osv):
         if 'name' not in default:
             name = self.read(cr, uid, [id])[0]['name']
             default.update({'name': name + " (copy)"})
-        return super(document_file, self).copy(cr, uid, id, default, context)
+        return super(document_file, self).copy(cr, uid, id, default, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
         result = False
@@ -222,7 +224,7 @@ class document_file(osv.osv):
         cr.commit() # ?
         return result
 
-    def __get_partner_id(self, cr, uid, res_model, res_id, context):
+    def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
         """ A helper to retrieve the associated partner from any res_model+id
             It is a hack that will try to discover if the mentioned record is
             clearly associated with a partner record.
@@ -246,7 +248,7 @@ class document_file(osv.osv):
         # rolled back) and then unlink the files. The list wouldn't exist
         # after we discard the objects
         ids = self.search(cr, uid, [('id','in',ids)])
-        for f in self.browse(cr, uid, ids, context):
+        for f in self.browse(cr, uid, ids, context=context):
             # TODO: update the node cache
             par = f.parent_id
             storage_id = None
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 9412527db22..2a3f54f53ba 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -143,7 +143,7 @@ class document_directory(osv.osv):
         _parent(dir_id, path)
         return path
 
-    def _check_recursion(self, cr, uid, ids):
+    def _check_recursion(self, cr, uid, ids, context=None):
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from document_directory where id in ('+','.join(map(str,ids))+')')
@@ -175,8 +175,6 @@ class document_directory(osv.osv):
         """ Return a node object for the given uri.
            This fn merely passes the call to node_context
         """
-        if not context:
-                context = {}
 
         return nodes.get_node_context(cr, uid, context).get_uri(cr, uri)
 
@@ -198,7 +196,7 @@ class document_directory(osv.osv):
         else:
             raise ValueError("dir node for %s type", dbro.type)
 
-    def _prepare_context(self, cr, uid, nctx, context):
+    def _prepare_context(self, cr, uid, nctx, context=None):
         """ Fill nctx with properties for this database
         @param nctx instance of nodes.node_context, to be filled
         @param context ORM context (dict) for us
@@ -212,7 +210,7 @@ class document_directory(osv.osv):
         """
         return
 
-    def get_dir_permissions(self, cr, uid, ids, context=None ):
+    def get_dir_permissions(self, cr, uid, ids, context=None):
         """Check what permission user 'uid' has on directory 'id'
         """
         assert len(ids) == 1
@@ -237,7 +235,7 @@ class document_directory(osv.osv):
             default ={}
         name = self.read(cr, uid, [id])[0]['name']
         default.update({'name': name+ " (copy)"})
-        return super(document_directory,self).copy(cr, uid, id, default, context)
+        return super(document_directory,self).copy(cr, uid, id, default, context=context)
 
     def _check_duplication(self, cr, uid, vals, ids=[], op='create'):
         name=vals.get('name',False)
diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py
index aa2edb6b411..b61b7fd65fc 100644
--- a/addons/document/document_storage.py
+++ b/addons/document/document_storage.py
@@ -422,9 +422,7 @@ class document_storage(osv.osv):
             optionally, fil_obj could point to the browse object of the file
             (ir.attachment)
         """
-        if not context:
-            context = {}
-        boo = self.browse(cr, uid, id, context)
+        boo = self.browse(cr, uid, id, context=context)
         if not boo.online:
             raise IOError(errno.EREMOTE, 'medium offline')
         
@@ -439,7 +437,7 @@ class document_storage(osv.osv):
         """
         if context is None:
             context = {}
-        boo = self.browse(cr, uid, id, context)
+        boo = self.browse(cr, uid, id, context=context)
         if not boo.online:
             raise IOError(errno.EREMOTE, 'medium offline')
         
@@ -540,9 +538,7 @@ class document_storage(osv.osv):
             This function MUST be used from an ir.attachment. It wouldn't make sense
             to store things persistently for other types (dynamic).
         """
-        if not context:
-            context = {}
-        boo = self.browse(cr, uid, id, context)
+        boo = self.browse(cr, uid, id, context=context)
         if fil_obj:
             ira = fil_obj
         else:
diff --git a/addons/document/i18n/document.pot b/addons/document/i18n/document.pot
index 06b565da5d4..b6930af2047 100644
--- a/addons/document/i18n/document.pot
+++ b/addons/document/i18n/document.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:29+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:29+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -202,6 +202,11 @@ msgstr ""
 msgid "Modified Date"
 msgstr ""
 
+#. module: document
+#: view:document.configuration:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
 #. module: document
 #: view:ir.attachment:0
 #: field:ir.attachment,partner_id:0
@@ -251,8 +256,8 @@ msgid "Storage"
 msgstr ""
 
 #. module: document
-#: field:document.directory,ressource_type_id:0
-msgid "Resource model"
+#: view:document.configuration:0
+msgid "Configure Resource Directory"
 msgstr ""
 
 #. module: document
@@ -302,6 +307,11 @@ msgstr ""
 msgid "Stored Filename"
 msgstr ""
 
+#. module: document
+#: field:document.directory,ressource_type_id:0
+msgid "Resource model"
+msgstr ""
+
 #. module: document
 #: view:document.directory:0
 #: field:report.document.user,type:0
@@ -629,6 +639,11 @@ msgstr ""
 msgid "Integrated Document Management System"
 msgstr ""
 
+#. module: document
+#: view:document.configuration:0
+msgid "Choose the following Resouces to auto directory configuration."
+msgstr ""
+
 #. module: document
 #: view:ir.attachment:0
 msgid "Attached To"
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index e56ee95524c..a810c1f510e 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-11-25 19:28+0000\n"
+"PO-Revision-Date: 2010-12-15 10:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:30+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
diff --git a/addons/document/wizard/document_configuration.py b/addons/document/wizard/document_configuration.py
index a497eb6af90..26ce8652599 100644
--- a/addons/document/wizard/document_configuration.py
+++ b/addons/document/wizard/document_configuration.py
@@ -34,7 +34,7 @@ class document_configuration(osv.osv_memory):
 
     def execute(self, cr, uid, ids, context=None):
         conf_id = ids and ids[0] or False
-        conf = self.browse(cr, uid, conf_id, context)
+        conf = self.browse(cr, uid, conf_id, context=context)
         dir_pool = self.pool.get('document.directory')
         data_pool = self.pool.get('ir.model.data')
         model_pool = self.pool.get('ir.model')
diff --git a/addons/document_ftp/i18n/document_ftp.pot b/addons/document_ftp/i18n/document_ftp.pot
index 2990053c602..14bddfbbe36 100644
--- a/addons/document_ftp/i18n/document_ftp.pot
+++ b/addons/document_ftp/i18n/document_ftp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:30+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -21,8 +21,8 @@ msgid "Auto Directory Configuration"
 msgstr ""
 
 #. module: document_ftp
-#: help:document.ftp.configuration,host:0
-msgid "Server address or IP and port to which users should connect to for DMS access"
+#: view:document.ftp.configuration:0
+msgid "Indicate the network address on which your OpenERP server should be reachable for end-users. This depends on your network topology and configuration, and will only affect the links displayed to the users. The format is HOST:PORT and the default host (localhost) is only suitable for access from the server machine itself.."
 msgstr ""
 
 #. module: document_ftp
@@ -42,7 +42,7 @@ msgstr ""
 
 #. module: document_ftp
 #: view:document.ftp.configuration:0
-msgid "title"
+msgid "Knowledge Application Configuration"
 msgstr ""
 
 #. module: document_ftp
@@ -70,8 +70,8 @@ msgid "_Browse"
 msgstr ""
 
 #. module: document_ftp
-#: view:document.ftp.configuration:0
-msgid "res_config_contents"
+#: help:document.ftp.configuration,host:0
+msgid "Server address or IP and port to which users should connect to for DMS access"
 msgstr ""
 
 #. module: document_ftp
@@ -84,11 +84,21 @@ msgstr ""
 msgid "_Cancel"
 msgstr ""
 
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "Configure FTP Server"
+msgstr ""
+
 #. module: document_ftp
 #: model:ir.module.module,shortdesc:document_ftp.module_meta_information
 msgid "Integrated FTP Server with Document Management System"
 msgstr ""
 
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr ""
+
 #. module: document_ftp
 #: model:ir.model,name:document_ftp.model_document_ftp_browse
 msgid "Document FTP Browse"
@@ -104,3 +114,8 @@ msgstr ""
 msgid "Browse Document"
 msgstr ""
 
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr ""
+
diff --git a/addons/document_ftp/i18n/pt.po b/addons/document_ftp/i18n/pt.po
index da44e207061..12f8e2b0a10 100644
--- a/addons/document_ftp/i18n/pt.po
+++ b/addons/document_ftp/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 15:13+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 09:39+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/i18n/sv.po b/addons/document_ftp/i18n/sv.po
index 133b212da1b..7a38920b9c3 100644
--- a/addons/document_ftp/i18n/sv.po
+++ b/addons/document_ftp/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 15:38+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 11:23+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ftp
diff --git a/addons/document_ftp/wizard/ftp_browse.py b/addons/document_ftp/wizard/ftp_browse.py
index 42081c98fd0..3e5787819b2 100644
--- a/addons/document_ftp/wizard/ftp_browse.py
+++ b/addons/document_ftp/wizard/ftp_browse.py
@@ -48,9 +48,9 @@ class document_ftp_browse(osv.osv_memory):
             res['url'] = 'ftp://%s@%s'%(current_user.login, url)
         return res
 
-    def browse_ftp(self, cr, uid, ids, context):
+    def browse_ftp(self, cr, uid, ids, context=None):
         data_id = ids and ids[0] or False
-        data = self.browse(cr, uid, data_id, context)
+        data = self.browse(cr, uid, data_id, context=context)
         final_url = data.url
         return {
         'type': 'ir.actions.act_url',
diff --git a/addons/document_ftp/wizard/ftp_configuration.py b/addons/document_ftp/wizard/ftp_configuration.py
index 5c6544dac5d..17dc99d202e 100644
--- a/addons/document_ftp/wizard/ftp_configuration.py
+++ b/addons/document_ftp/wizard/ftp_configuration.py
@@ -39,7 +39,7 @@ class document_ftp_configuration(osv.osv_memory):
     }
 
     def execute(self, cr, uid, ids, context=None):
-        conf = self.browse(cr, uid, ids[0], context)
+        conf = self.browse(cr, uid, ids[0], context=context)
         data_pool = self.pool.get('ir.model.data')
         # Update the action for FTP browse.
         aid = data_pool._get_id(cr, uid, 'document_ftp', 'action_document_browse')
diff --git a/addons/document_ics/document_ics.py b/addons/document_ics/document_ics.py
index 9133a525afa..45b89997287 100644
--- a/addons/document_ics/document_ics.py
+++ b/addons/document_ics/document_ics.py
@@ -347,7 +347,6 @@ class crm_meeting(osv.osv):
         """
 
         if not default: default = {}
-        if not context: context = {}
         default.update({'code': self.pool.get('ir.sequence').get(cr, uid, 'crm.meeting'), 'id': False})
         return super(crm_meeting, self).copy(cr, uid, id, default, context)
 
diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index 51ccab59204..5c338cf6dd0 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -78,7 +78,7 @@ class document_ics_crm_wizard(osv.osv_memory):
             @param ids: List of Document CRM wizard’s IDs
             @param context: A standard dictionary for contextual values """
 
-        data=self.read(cr, uid, ids, [])[0]
+        data = self.read(cr, uid, ids, [], context=context)[0]
         dir_obj = self.pool.get('document.directory')
         dir_cont_obj = self.pool.get('document.directory.content')
         dir_id = dir_obj.search(cr, uid, [('name', '=', 'Calendars')])
diff --git a/addons/document_ics/i18n/document_ics.pot b/addons/document_ics/i18n/document_ics.pot
index 86a482b23a5..1f8349ea09f 100644
--- a/addons/document_ics/i18n/document_ics.pot
+++ b/addons/document_ics/i18n/document_ics.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:30+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:16+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -40,6 +40,11 @@ msgstr ""
 msgid "Jobs Hiring Process"
 msgstr ""
 
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure Calendars for CRM Sections"
+msgstr ""
+
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
@@ -71,8 +76,8 @@ msgid "Calendar of Meetings"
 msgstr ""
 
 #. module: document_ics
-#: model:crm.case.section,name:document_ics.section_meeting
-msgid "Shared Calendar Meetings"
+#: view:document.ics.crm.wizard:0
+msgid "OpenERP can create and pre-configure a series of integrated calendar for you."
 msgstr ""
 
 #. module: document_ics
@@ -85,6 +90,11 @@ msgstr ""
 msgid "dtend"
 msgstr ""
 
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "summary"
+msgstr ""
+
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_crm_meeting
 msgid "Meeting"
@@ -200,6 +210,11 @@ msgstr ""
 msgid "Manages the calendar of meetings of the users."
 msgstr ""
 
+#. module: document_ics
+#: field:document.directory.content,ics_domain:0
+msgid "Domain"
+msgstr ""
+
 #. module: document_ics
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
@@ -245,14 +260,19 @@ msgstr ""
 msgid "categories"
 msgstr ""
 
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "Configure"
+msgstr ""
+
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Use the field"
 msgstr ""
 
 #. module: document_ics
-#: field:document.directory.content,ics_domain:0
-msgid "Domain"
+#: view:document.ics.crm.wizard:0
+msgid "Create Pre-Configured Calendars"
 msgstr ""
 
 #. module: document_ics
@@ -291,8 +311,8 @@ msgid "If set, a separate                         instance will be created for e
 msgstr ""
 
 #. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "summary"
+#: view:document.ics.crm.wizard:0
+msgid "res_config_contents"
 msgstr ""
 
 #. module: document_ics
@@ -306,8 +326,8 @@ msgid "document.ics.crm.wizard"
 msgstr ""
 
 #. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "res_config_contents"
+#: model:crm.case.section,name:document_ics.section_meeting
+msgid "Shared Calendar Meetings"
 msgstr ""
 
 #. module: document_ics
diff --git a/addons/document_ics/i18n/fr.po b/addons/document_ics/i18n/fr.po
index f1699b8ef69..f474ea37313 100644
--- a/addons/document_ics/i18n/fr.po
+++ b/addons/document_ics/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 02:10+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-16 03:38+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
@@ -22,6 +23,8 @@ msgid ""
 "Manages the supplier and customers claims,including your corrective or "
 "preventive actions."
 msgstr ""
+"Gère les réclamations des clients et des fournisseurs, y compris vos actions "
+"préventives et correctives."
 
 #. module: document_ics
 #: field:document.directory.content,object_id:0
@@ -67,6 +70,8 @@ msgid ""
 "The field of the                         object used in the filename. Has to "
 "be a unique identifier."
 msgstr ""
+"Le champ de l'objet utilisé dans le nom de fichier. Ce doit être un "
+"identifiant unique."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -104,6 +109,9 @@ msgid ""
 "Allows you to track and manage leads which are pre-sales requests or "
 "contacts, the very first contact with a customer request."
 msgstr ""
+"Vous permet de suivre et de gérer les opportunités que sont les demandes ou "
+"les contacts de pré-vente, le tout premier contact avec une demande de "
+"client."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -113,7 +121,7 @@ msgstr "description"
 #. module: document_ics
 #: field:document.directory.ics.fields,fn:0
 msgid "Function"
-msgstr ""
+msgstr "Fonction"
 
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
@@ -136,6 +144,8 @@ msgid ""
 "Helps you to organise the jobs hiring process: evaluation, meetings, email "
 "integration..."
 msgstr ""
+"Vous aide à organiser le processus d'embauche : evaluation, réunions, "
+"intégration de courriel..."
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -155,7 +165,7 @@ msgstr "Contenu du répertoire"
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_directory_ics_fields
 msgid "Document Directory ICS Fields"
-msgstr ""
+msgstr "Champs ICS du répertoire du document"
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
@@ -168,11 +178,13 @@ msgid ""
 "Helps you to encode the result of a phone call or to plan a list of phone "
 "calls to process."
 msgstr ""
+"Vous aide à saisir le résultat d'un appel téléphonique ou d'établir une "
+"liste des appels à traiter."
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "OpenERP Field"
-msgstr ""
+msgstr "Champ OpenERP"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -187,7 +199,7 @@ msgstr "Valeur ICS"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Expression as constant"
-msgstr ""
+msgstr "Expression représentant une constante"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -207,7 +219,7 @@ msgstr "Nom"
 #. module: document_ics
 #: help:document.directory.ics.fields,fn:0
 msgid "Alternate method                 of calculating the value"
-msgstr ""
+msgstr "Méthode alternative de calcul de la valeur"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
@@ -218,6 +230,8 @@ msgstr "Gère le calendrier des rendez-vous des utilisateurs"
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
+"Utilisé par les sociétés pour suivre les bugs et les demandes de support sur "
+"le logiciel."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -262,7 +276,7 @@ msgstr "catégories"
 #. module: document_ics
 #: selection:document.directory.ics.fields,fn:0
 msgid "Use the field"
-msgstr ""
+msgstr "Utilise le champ"
 
 #. module: document_ics
 #: field:document.directory.content,ics_domain:0
@@ -272,12 +286,12 @@ msgstr "Domaine"
 #. module: document_ics
 #: field:document.directory.content,fname_field:0
 msgid "Filename field"
-msgstr ""
+msgstr "Champ de nom de fichier"
 
 #. module: document_ics
 #: field:document.directory.content,obj_iterate:0
 msgid "Iterate object"
-msgstr ""
+msgstr "Parcourir les objets"
 
 #. module: document_ics
 #: field:crm.meeting,code:0
@@ -306,6 +320,8 @@ msgid ""
 "If set, a separate                         instance will be created for each "
 "record of Object"
 msgstr ""
+"Si coché, une instance indépendante sera créée pour chaque enregistrement de "
+"l'objet."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -315,7 +331,7 @@ msgstr "résumé"
 #. module: document_ics
 #: field:document.ics.crm.wizard,lead:0
 msgid "Leads"
-msgstr ""
+msgstr "Pistes"
 
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
diff --git a/addons/document_webdav/document_webdav.py b/addons/document_webdav/document_webdav.py
index 2e1eb8cabd2..d2107e4f927 100644
--- a/addons/document_webdav/document_webdav.py
+++ b/addons/document_webdav/document_webdav.py
@@ -45,7 +45,7 @@ class document_davdir(osv.osv):
         else:
             raise ValueError("dir node for %s type", dbro.type)
 
-    def _prepare_context(self, cr, uid, nctx, context):
+    def _prepare_context(self, cr, uid, nctx, context=None):
         nctx.node_file_class = nodes.node_file
         # We can fill some more fields, but avoid any expensive function
         # that might be not worth preparing.
diff --git a/addons/document_webdav/i18n/document_webdav.pot b/addons/document_webdav/i18n/document_webdav.pot
index 639e07570a3..95b1d17fb25 100644
--- a/addons/document_webdav/i18n/document_webdav.pot
+++ b/addons/document_webdav/i18n/document_webdav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:30+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:17+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/document_webdav/i18n/fr.po b/addons/document_webdav/i18n/fr.po
index 870c486ccef..30dd83508d5 100644
--- a/addons/document_webdav/i18n/fr.po
+++ b/addons/document_webdav/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 22:11+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-15 20:39+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav
@@ -47,7 +48,7 @@ msgstr "Ces propriétés seront ajoutés aux requêtes WebDAV"
 #: code:addons/document_webdav/webdav.py:0
 #, python-format
 msgid "PyWebDAV Import Error!"
-msgstr ""
+msgstr "Erreur d'import PyWebDAV !"
 
 #. module: document_webdav
 #: sql_constraint:document.directory:0
@@ -77,6 +78,9 @@ msgid ""
 "http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
 "0.9.4.tar.gz&can=2&q=/"
 msgstr ""
+"Installer PyWebDAV à partir de l'URL : "
+"http://code.google.com/p/pywebdav/downloads/detail?name=PyWebDAV-"
+"0.9.4.tar.gz&can=2&q=/"
 
 #. module: document_webdav
 #: model:ir.ui.menu,name:document_webdav.menu_dir_props
@@ -123,7 +127,7 @@ msgstr "Serveur WebDAV pour le Module de Gestion Documentaire"
 #. module: document_webdav
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage"
-msgstr ""
+msgstr "Le répertoire doit avoir un parent ou un espace de stockage"
 
 #. module: document_webdav
 #: view:document.webdav.dir.property:0
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 4b1ec7e8e0f..eee1a13bb70 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -70,9 +70,9 @@ def get_value(cursor, user, recid, message=None, template=None, context=None):
     if message:
         try:
             message = tools.ustr(message)
-            object = pool.get(template.model_int_name).browse(cursor, user, recid, context)
+            object = pool.get(template.model_int_name).browse(cursor, user, recid, context=context)
             env = {
-                'user':pool.get('res.users').browse(cursor, user, user, context),
+                'user':pool.get('res.users').browse(cursor, user, user, context=context),
                 'db':cursor.dbname
                    }
             if template.template_language == 'mako':
@@ -262,9 +262,11 @@ This is useful for CRM leads for example"),
         ('name', 'unique (name)','The template name must be unique !')
     ]
 
-    def create_action(self, cr, uid, ids, context):
+    def create_action(self, cr, uid, ids, context=None):
         vals = {}
-        template_obj = self.browse(cr, uid, ids)[0]
+        if context is None:
+            context = {}
+        template_obj = self.browse(cr, uid, ids, context=context)[0]
         src_obj = template_obj.object_name.model
         vals['ref_ir_act_window'] = self.pool.get('ir.actions.act_window').create(cr, uid, {
              'name': template_obj.name,
@@ -291,8 +293,8 @@ This is useful for CRM leads for example"),
         }, context)
         return True
 
-    def unlink_action(self, cr, uid, ids, context):
-        for template in self.browse(cr, uid, ids, context):
+    def unlink_action(self, cr, uid, ids, context=None):
+        for template in self.browse(cr, uid, ids, context=context):
             try:
                 if template.ref_ir_act_window:
                     self.pool.get('ir.actions.act_window').unlink(cr, uid, template.ref_ir_act_window.id, context)
@@ -301,13 +303,13 @@ This is useful for CRM leads for example"),
             except:
                 raise osv.except_osv(_("Warning"), _("Deletion of Record failed"))
 
-    def delete_action(self, cr, uid, ids, context):
-        self.unlink_action(cr, uid, ids, context)
+    def delete_action(self, cr, uid, ids, context=None):
+        self.unlink_action(cr, uid, ids, context=context)
         return True
 
     def unlink(self, cr, uid, ids, context=None):
-        self.unlink_action(cr, uid, ids, context)
-        return super(email_template, self).unlink(cr, uid, ids, context)
+        self.unlink_action(cr, uid, ids, context=context)
+        return super(email_template, self).unlink(cr, uid, ids, context=context)
 
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
diff --git a/addons/email_template/email_template_account.py b/addons/email_template/email_template_account.py
index 281a876fc22..462baa1672d 100644
--- a/addons/email_template/email_template_account.py
+++ b/addons/email_template/email_template_account.py
@@ -170,7 +170,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
     def name_get(self, cr, uid, ids, context=None):
         return [(a["id"], "%s (%s)" % (a['email_id'], a['name'])) for a in self.read(cr, uid, ids, ['name', 'email_id'], context=context)]
 
-    def _constraint_unique(self, cursor, user, ids):
+    def _constraint_unique(self, cursor, user, ids, context=None):
         """
         This makes sure that you dont give personal 
         users two accounts with same ID (Validated in sql constaints)
@@ -212,7 +212,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         #Type cast ids to integer
         if type(ids) == list:
             ids = ids[0]
-        this_object = self.browse(cursor, user, ids, context)
+        this_object = self.browse(cursor, user, ids, context=context)
         if this_object:
             if this_object.smtpserver and this_object.smtpport: 
                 try:
@@ -256,7 +256,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
                                  _("Reason: %s") % error
                                  )
     
-    def do_approval(self, cr, uid, ids, context={}):
+    def do_approval(self, cr, uid, ids, context=None):
         #TODO: Check if user has rights
         self.write(cr, uid, ids, {'state':'approved'}, context=context)
 #        wf_service = netsvc.LocalService("workflow")
@@ -267,7 +267,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
         """
         #This function returns a SMTP server object
         logger = netsvc.Logger()
-        core_obj = self.browse(cursor, user, id, context)
+        core_obj = self.browse(cursor, user, id, context=context)
         if core_obj.smtpserver and core_obj.smtpport and core_obj.state == 'approved':
             try:
                 serv = self.get_outgoing_server(cursor, user, id, context)
diff --git a/addons/email_template/email_template_mailbox.py b/addons/email_template/email_template_mailbox.py
index 51d73ffc76c..2fb3b0fa54c 100644
--- a/addons/email_template/email_template_mailbox.py
+++ b/addons/email_template/email_template_mailbox.py
@@ -40,7 +40,7 @@ class email_template_mailbox(osv.osv):
         to periodically send emails
         """
         try:
-            self.send_all_mail(cursor, user, context)
+            self.send_all_mail(cursor, user, context=context)
         except Exception, e:
             LOGGER.notifyChannel(
                                  "Email Template",
@@ -196,8 +196,6 @@ class email_template_mailbox(osv.osv):
         It just changes the folder of the item to "Trash", if it is no in Trash folder yet, 
         or completely deletes it if it is already in Trash.
         """
-        if not context:
-            context = {}
         to_update = []
         to_remove = []
         for mail in self.browse(cr, uid, ids, context=context):
diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot
index f23ab1895fe..bd2ef444256 100644
--- a/addons/email_template/i18n/email_template.pot
+++ b/addons/email_template/i18n/email_template.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:31+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:18+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/email_template/i18n/it.po b/addons/email_template/i18n/it.po
index aafe3318c00..6aa8e28019b 100644
--- a/addons/email_template/i18n/it.po
+++ b/addons/email_template/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 08:14+0000\n"
+"PO-Revision-Date: 2010-12-15 11:22+0000\n"
 "Last-Translator: Lorenzo Battistini - agilebg.com "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
diff --git a/addons/email_template/i18n/sv.po b/addons/email_template/i18n/sv.po
index 56fe974da79..c9444b7569e 100644
--- a/addons/email_template/i18n/sv.po
+++ b/addons/email_template/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 10:47+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 11:06+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: email_template
diff --git a/addons/email_template/wizard/email_template_send_wizard.py b/addons/email_template/wizard/email_template_send_wizard.py
index 3588ca20ded..4f6ab7af381 100644
--- a/addons/email_template/wizard/email_template_send_wizard.py
+++ b/addons/email_template/wizard/email_template_send_wizard.py
@@ -170,7 +170,7 @@ class email_template_send_wizard(osv.osv_memory):
     def sav_to_drafts(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        mailid = self.save_to_mailbox(cr, uid, ids, context)
+        mailid = self.save_to_mailbox(cr, uid, ids, context=context)
         if self.pool.get('email_template.mailbox').write(cr, uid, mailid, {'folder':'drafts'}, context):
             return {'type':'ir.actions.act_window_close' }
 
diff --git a/addons/event/event.py b/addons/event/event.py
index 8c8bed8584b..02fe6ff6a0c 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -101,7 +101,7 @@ class event_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
         res = False
         if type(ids) in (int, long,):
@@ -246,11 +246,11 @@ class event_event(osv.osv):
         'user_id': lambda obj, cr, uid, context: uid,
     }
 
-    def _check_recursion(self, cr, uid, ids):
-        return super(event_event, self)._check_recursion(cr, uid, ids)
+    def _check_recursion(self, cr, uid, ids, context=None):
+        return super(event_event, self)._check_recursion(cr, uid, ids, context=context)
 
-    def _check_closing_date(self, cr, uid, ids):
-        for event in self.browse(cr, uid, ids):
+    def _check_closing_date(self, cr, uid, ids, context=None):
+        for event in self.browse(cr, uid, ids, context=context):
             if event.date_end < event.date_begin:
                 return False
         return True
@@ -267,8 +267,6 @@ class event_event(osv.osv):
         """
         if not team_id:
             return {}
-        if context is None:
-            context = {}
         team_pool = self.pool.get('crm.case.section')
         res = {}
         team = team_pool.browse(cr, uid, team_id, context=context)
@@ -287,7 +285,6 @@ class event_registration(osv.osv):
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         cur_obj = self.pool.get('res.currency')
         res = {}
-        context = context or {}
         for line in self.browse(cr, uid, ids, context=context):
             price = line.unit_price * line.nb_register
             pricelist = line.event_id.pricelist_id or line.partner_invoice_id.property_product_pricelist
@@ -382,7 +379,7 @@ class event_registration(osv.osv):
         inv_pool = self.pool.get('account.invoice')
         product_pool = self.pool.get('product.product')
         contact_pool = self.pool.get('res.partner.contact')
-        if not context:
+        if context is None:
             context = {}
         # If date was specified, use it as date invoiced, usefull when invoices are generated this month and put the
         # last day of the last month as invoice date
@@ -438,7 +435,7 @@ class event_registration(osv.osv):
     def do_close(self, cr, uid, ids, context=None):
         """ Close Registration
         """
-        if not context:
+        if context is None:
             context = {}
         invoice_id = context.get('invoice_id', False)
         values = {'state': 'done', 'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}
@@ -455,12 +452,12 @@ class event_registration(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
-            context = {}
         if type(ids) in (int, long,):
             ids = [ids]
         data_pool = self.pool.get('ir.model.data')
         unconfirmed_ids = []
+        if context is None:
+            context = {}
         for registration in self.browse(cr, uid, ids, context=context):
             total_confirmed = registration.event_id.register_current + registration.nb_register
             if total_confirmed <= registration.event_id.register_max or registration.event_id.register_max == 0:
@@ -488,8 +485,6 @@ class event_registration(osv.osv):
     def button_reg_close(self, cr, uid, ids, context=None):
         """This Function Close Event Registration.
         """
-        if not context:
-            context = {}
         data_pool = self.pool.get('ir.model.data')
         unclosed_ids = []
         for registration in self.browse(cr, uid, ids, context=context):
@@ -526,8 +521,6 @@ class event_registration(osv.osv):
         """
         Send email to user
         """
-        if not context:
-            context = {}
 
         for regestration in self.browse(cr, uid, ids, context=context):
             src = regestration.event_id.reply_to or False
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index 8f702436483..c64d37e64ea 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:32+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:32+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/event/i18n/vi.po b/addons/event/i18n/vi.po
index 11cac340d66..d8eae2482e8 100644
--- a/addons/event/i18n/vi.po
+++ b/addons/event/i18n/vi.po
@@ -1,20 +1,20 @@
 # Vietnamese translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-02 14:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 15:18+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event
@@ -42,7 +42,7 @@ msgstr ""
 #: view:event.registration:0
 #: view:report.event.registration:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: event
 #: field:event.event,register_min:0
@@ -101,7 +101,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: event
 #: field:event.event,mail_confirm:0
@@ -455,7 +455,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: event
 #: view:event.event:0
@@ -580,12 +580,12 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười hai"
 
 #. module: event
 #: field:event.registration,event_product:0
@@ -717,7 +717,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: event
 #: field:res.partner,event_ids:0
@@ -728,7 +728,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: event
 #: help:event.event,mail_auto_registr:0
@@ -761,12 +761,12 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười một"
 
 #. module: event
 #: view:report.event.registration:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Bộ lọc mở rộng..."
 
 #. module: event
 #: help:event.event,reply_to:0
@@ -776,7 +776,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: event
 #: help:event.event,register_current:0
@@ -797,7 +797,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Một"
 
 #. module: event
 #: help:event.registration,email_from:0
@@ -1008,7 +1008,7 @@ msgstr ""
 #: view:report.event.registration:0
 #: field:report.event.registration,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: event
 #: view:event.event:0
@@ -1031,7 +1031,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: event
 #: view:res.partner:0
@@ -1089,7 +1089,7 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: event
 #: view:board.board:0
@@ -1112,7 +1112,7 @@ msgstr ""
 #. module: event
 #: field:event.event,country_id:0
 msgid "Country"
-msgstr ""
+msgstr "Quốc gia"
 
 #. module: event
 #: code:addons/event/wizard/event_make_invoice.py:0
@@ -1132,13 +1132,13 @@ msgstr ""
 #. module: event
 #: selection:report.event.registration,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: event
 #: field:event.event,name:0
 #: field:event.registration,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Tóm tắt"
 
 #. module: event
 #: view:event.event:0
diff --git a/addons/event/wizard/partner_event_registration.py b/addons/event/wizard/partner_event_registration.py
index d8639b4e646..b8521e404e2 100644
--- a/addons/event/wizard/partner_event_registration.py
+++ b/addons/event/wizard/partner_event_registration.py
@@ -105,8 +105,6 @@ class partner_event_registration(osv.osv_memory):
         """Overrides orm name_get method
         @param ids: List of partner_event_register ids
         """
-        if not context:
-            context = {}
 
         res = []
         if not ids:
@@ -124,7 +122,7 @@ class partner_event_registration(osv.osv_memory):
         event_obj = self.pool.get('event.event')
         product_obj = self.pool.get('product.product')
         partner_obj = self.pool.get('res.partner')
-        if not context:
+        if context is None:
             context = {}
         partner_id = context.get('active_id', False)
         if event_id:
diff --git a/addons/event_project/event_project.py b/addons/event_project/event_project.py
index b892835bb49..8590b84c4ad 100644
--- a/addons/event_project/event_project.py
+++ b/addons/event_project/event_project.py
@@ -24,8 +24,6 @@ from osv import fields, osv
 class one2many_mod_task(fields.one2many):
     
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
-            context = {}
         if not values:
                 values = {}
         res = {}
diff --git a/addons/event_project/i18n/event_project.pot b/addons/event_project/i18n/event_project.pot
index 443cadf3222..287f18ada0e 100644
--- a/addons/event_project/i18n/event_project.pot
+++ b/addons/event_project/i18n/event_project.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:33+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:33+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/event_project/i18n/fr.po b/addons/event_project/i18n/fr.po
index 85fd18d0250..66264eee845 100644
--- a/addons/event_project/i18n/fr.po
+++ b/addons/event_project/i18n/fr.po
@@ -7,19 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-11 23:49+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-15 20:40+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: model:ir.model,name:event_project.model_event_project
 msgid "Event Project"
-msgstr ""
+msgstr "Projet d'événement"
 
 #. module: event_project
 #: field:event.project,date:0
@@ -69,7 +70,7 @@ msgstr "Générer le retro planning"
 #. module: event_project
 #: constraint:event.event:0
 msgid "Error ! Closing Date cannot be set before Beginning Date."
-msgstr ""
+msgstr "Erreur ! La date de fermeture ne peut pas précéder la date de début."
 
 #. module: event_project
 #: field:event.event,project_id:0
diff --git a/addons/event_project/wizard/event_project_retro.py b/addons/event_project/wizard/event_project_retro.py
index f8e65cdb4ff..ada9b7fa17b 100644
--- a/addons/event_project/wizard/event_project_retro.py
+++ b/addons/event_project/wizard/event_project_retro.py
@@ -55,7 +55,7 @@ class event_project(osv.osv_memory):
         event_obj = self.pool.get('event.event')
         if context is None:
             context = {}
-        event = event_obj.browse(cr, uid, context.get('active_id', False))
+        event = event_obj.browse(cr, uid, context.get('active_id', False), context=context)
         res = datetime.strptime(event.date_end, "%Y-%m-%d %H:%M:%S").strftime("%Y-%m-%d")
         return res
         
@@ -64,11 +64,11 @@ class event_project(osv.osv_memory):
         'date': _get_date_end
     }
     
-    def create_duplicate(self, cr, uid, ids, context):
+    def create_duplicate(self, cr, uid, ids, context=None):
         event_obj = self.pool.get('event.event')
         project_obj = self.pool.get('project.project')
-        event = event_obj.browse(cr, uid, context.get('active_id', False))
-        for current in self.browse(cr, uid, ids):
+        event = event_obj.browse(cr, uid, context.get('active_id', False), context=context)
+        for current in self.browse(cr, uid, ids, context=context):
             duplicate_project_id = project_obj.copy(cr, uid, current.project_id.id, {
                     'active': True,
                     'date_start':current.date_start,
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 7592061ec36..772771db915 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -71,9 +71,9 @@ class email_server(osv.osv):
         'user_id': lambda self, cr, uid, ctx: uid,
     }
 
-    def check_duplicate(self, cr, uid, ids):
+    def check_duplicate(self, cr, uid, ids, context=None):
         # RFC *-* Why this limitation? why not in SQL constraint?
-        vals = self.read(cr, uid, ids, ['user', 'password'])[0]
+        vals = self.read(cr, uid, ids, ['user', 'password'], context=context)[0]
         cr.execute("select count(id) from email_server where user=%s and password=%s", (vals['user'], vals['password']))
         res = cr.fetchone()
         if res:
@@ -105,12 +105,14 @@ class email_server(osv.osv):
 
         return {'value':{'port':port}}
 
-    def set_draft(self, cr, uid, ids, context={}):
+    def set_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids , {'state':'draft'})
         return True
     
-    def button_confirm_login(self, cr, uid, ids, context={}):
-        for server in self.browse(cr, uid, ids, context):
+    def button_confirm_login(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        for server in self.browse(cr, uid, ids, context=context):
             logger.notifyChannel('imap', netsvc.LOG_INFO, 'fetchmail start checking for new emails on %s' % (server.name))
             context.update({'server_id': server.id, 'server_type': server.type})
             try:
@@ -144,20 +146,22 @@ class email_server(osv.osv):
                 logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e))
         return True
 
-    def button_fetch_mail(self, cr, uid, ids, context={}):
+    def button_fetch_mail(self, cr, uid, ids, context=None):
         self.fetch_mail(cr, uid, ids, context=context)
         return True
 
-    def _fetch_mails(self, cr, uid, ids=False, context={}):
+    def _fetch_mails(self, cr, uid, ids=False, context=None):
         if not ids:
             ids = self.search(cr, uid, [])
         return self.fetch_mail(cr, uid, ids, context=context)
 
-    def fetch_mail(self, cr, uid, ids, context={}):
+    def fetch_mail(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         email_tool = self.pool.get('email.server.tools')
         action_pool = self.pool.get('ir.actions.server')
         context.update({'get_server': True})
-        for server in self.browse(cr, uid, ids, context):
+        for server in self.browse(cr, uid, ids, context=context):
             count = 0
             user = server.user_id.id or uid
             try:
@@ -215,7 +219,7 @@ class mailgate_message(osv.osv):
     _order = 'id desc'
 
     def create(self, cr, uid, values, context=None):
-        if not context:
+        if context is None:
             context={}
         server_id = context.get('server_id',False)
         server_type = context.get('server_type',False)
@@ -227,7 +231,7 @@ class mailgate_message(osv.osv):
         return res
 
     def write(self, cr, uid, ids, values, context=None):
-        if not context:
+        if context is None:
             context={}
         server_id = context.get('server_id',False)
         server_type = context.get('server_type',False)
diff --git a/addons/fetchmail/i18n/fetchmail.pot b/addons/fetchmail/i18n/fetchmail.pot
index 5c6a033854e..815cb9a15fe 100644
--- a/addons/fetchmail/i18n/fetchmail.pot
+++ b/addons/fetchmail/i18n/fetchmail.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:33+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:33+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:19+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,6 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. module: fetchmail
+#: constraint:email.server:0
+msgid "Warning! Record for selected Model can not be created\n"
+"Please choose valid Model"
+msgstr ""
+
 #. module: fetchmail
 #: selection:email.server,state:0
 msgid "Confirmed"
@@ -25,11 +31,6 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#. module: fetchmail
-#: field:email.server,action_id:0
-msgid "Reply Email"
-msgstr ""
-
 #. module: fetchmail
 #: view:email.server:0
 msgid "Group By..."
@@ -73,8 +74,9 @@ msgid "Description"
 msgstr ""
 
 #. module: fetchmail
-#: field:email.server,priority:0
-msgid "Server Priority"
+#: help:email.server,object_id:0
+msgid "OpenObject Model. Generates a record of this model.\n"
+"Select Object with message_new attrbutes."
 msgstr ""
 
 #. module: fetchmail
@@ -108,8 +110,8 @@ msgid "Waiting for Verification"
 msgstr ""
 
 #. module: fetchmail
-#: help:email.server,object_id:0
-msgid "OpenObject Model. Generates a record of this model."
+#: field:email.server,password:0
+msgid "Password"
 msgstr ""
 
 #. module: fetchmail
@@ -197,11 +199,6 @@ msgstr ""
 msgid "POP/IMAP Server"
 msgstr ""
 
-#. module: fetchmail
-#: field:email.server,password:0
-msgid "Password"
-msgstr ""
-
 #. module: fetchmail
 #: constraint:email.server:0
 msgid "Warning! Can't have duplicate server configuration!"
@@ -265,6 +262,16 @@ msgstr ""
 msgid "Priority between 0 to 10, select define the order of Processing"
 msgstr ""
 
+#. module: fetchmail
+#: field:email.server,action_id:0
+msgid "Email Server Action"
+msgstr ""
+
+#. module: fetchmail
+#: field:email.server,priority:0
+msgid "Server Priority"
+msgstr ""
+
 #. module: fetchmail
 #: view:mailgate.message:0
 #: field:mailgate.message,server_id:0
diff --git a/addons/google_map/i18n/google_map.pot b/addons/google_map/i18n/google_map.pot
index 9d37ae494a1..efdc37635d8 100644
--- a/addons/google_map/i18n/google_map.pot
+++ b/addons/google_map/i18n/google_map.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:34+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:34+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:20+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/google_map/i18n/sl.po b/addons/google_map/i18n/sl.po
index 84e611d46f5..9518d02ec8f 100644
--- a/addons/google_map/i18n/sl.po
+++ b/addons/google_map/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-11-26 12:12+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 11:30+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
@@ -35,7 +35,7 @@ msgstr "Poženi Google Zemljevid"
 #. module: google_map
 #: model:ir.model,name:google_map.model_res_partner_address
 msgid "Partner Addresses"
-msgstr "Naslovi partnerja"
+msgstr "Naslovi stranke"
 
 #. module: google_map
 #: view:res.partner:0
diff --git a/addons/google_map/wizard/google_map_launch.py b/addons/google_map/wizard/google_map_launch.py
index 12ab32fbf54..a2b3003da7c 100644
--- a/addons/google_map/wizard/google_map_launch.py
+++ b/addons/google_map/wizard/google_map_launch.py
@@ -25,9 +25,9 @@ import pooler
 from osv import fields
 import time
 
-def _launch_wizard(self, cr, uid, data, context):
+def _launch_wizard(self, cr, uid, data, context=None):
     address_obj= pooler.get_pool(cr.dbname).get('res.partner.address')
-    m= address_obj.browse(cr,uid,data['id'],context)
+    m= address_obj.browse(cr, uid, data['id'], context=context)
     url=''
     url="http://maps.google.com/maps?oi=map&q="
     if m.street:
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 9783efa58b6..8a53ddad805 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -28,7 +28,7 @@ class hr_employee_category(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not ids:
             return []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
         res = []
         for record in reads:
             name = record['name']
@@ -37,8 +37,8 @@ class hr_employee_category(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
-        res = self.name_get(cr, uid, ids, context)
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
     _name = "hr.employee.category"
@@ -70,7 +70,7 @@ class hr_employee_marital_status(osv.osv):
     _name = "hr.employee.marital.status"
     _description = "Employee Marital Status"
     _columns = {
-        'name': fields.char('Marital Status', size=32, required=True),
+        'name': fields.char('Marital Status', size=32, required=True, translate=True),
         'description': fields.text('Status Description'),
     }
 
@@ -80,13 +80,13 @@ class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for job in self.browse(cr, uid, ids, context):
+        for job in self.browse(cr, uid, ids, context=context):
             res[job.id] = len(job.employee_ids or [])
         return res
 
     def _no_of_recruitement(self, cr, uid, ids, name, args, context=None):
         res = {}
-        for job in self.browse(cr, uid, ids, context):
+        for job in self.browse(cr, uid, ids, context=context):
             res[job.id] = job.expected_employees - job.no_of_employee
         return res
 
@@ -166,7 +166,7 @@ class hr_employee(osv.osv):
     def onchange_company(self, cr, uid, ids, company, context=None):
         address_id = False
         if company:
-            company_id = self.pool.get('res.company').browse(cr,uid,company)
+            company_id = self.pool.get('res.company').browse(cr, uid, company, context=context)
             address = self.pool.get('res.partner').address_get(cr, uid, [company_id.partner_id.id], ['default'])
             address_id = address and address['default'] or False
         return {'value': {'address_id' : address_id}}
@@ -174,7 +174,7 @@ class hr_employee(osv.osv):
     def onchange_user(self, cr, uid, ids, user_id, context=None):
         work_email = False
         if user_id:
-            work_email = self.pool.get('res.users').browse(cr, uid, user_id).user_email
+            work_email = self.pool.get('res.users').browse(cr, uid, user_id, context=context).user_email
         return {'value': {'work_email' : work_email}}
 
     def _get_photo(self, cr, uid, context=None):
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index 8e1d11716c2..c885fdf30bd 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -38,8 +38,6 @@ class hr_department(osv.osv):
         return res
 
     def _dept_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
-        if context is None:
-            context = {}
         res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
@@ -58,8 +56,6 @@ class hr_department(osv.osv):
                 }
 
     def _get_members(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         mids = self.search(cr, uid, [('manager_id', '=', uid)], context=context)
         result = {uid: 1}
         for m in self.browse(cr, uid, mids, context=context):
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index e653de5b1fb..bfa1be527bb 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:34+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:34+0000\n"
+"POT-Creation-Date: 2010-12-15 17:21:47+0000\n"
+"PO-Revision-Date: 2010-12-15 17:21:47+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -149,6 +149,11 @@ msgstr ""
 msgid "My Departments Employee"
 msgstr ""
 
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_married
+msgid "Married"
+msgstr ""
+
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot select a department for which the employee is the manager."
@@ -266,8 +271,9 @@ msgid "Other information"
 msgstr ""
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.action_hr_installer
-msgid "Human Resources Application Configuration"
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
+msgid "Name"
 msgstr ""
 
 #. module: hr
@@ -308,6 +314,11 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
+#. module: hr
+#: view:hr.installer:0
+msgid "You can enhance the base HR Application by installing few HR-related functionalities."
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
@@ -323,6 +334,11 @@ msgstr ""
 msgid "Social Insurance Number"
 msgstr ""
 
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_divorced
+msgid "Divorced"
+msgstr ""
+
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
@@ -357,6 +373,11 @@ msgstr ""
 msgid "Male"
 msgstr ""
 
+#. module: hr
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_form
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_form
@@ -451,8 +472,8 @@ msgid "Your Company's Departments Structure is used to manage all documents rela
 msgstr ""
 
 #. module: hr
-#: field:hr.installer,progress:0
-msgid "Configuration Progress"
+#: view:hr.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: hr
@@ -613,6 +634,11 @@ msgstr ""
 msgid "Payroll"
 msgstr ""
 
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_single
+msgid "Single"
+msgstr ""
+
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
@@ -657,9 +683,9 @@ msgid "Resource"
 msgstr ""
 
 #. module: hr
-#: field:hr.department,complete_name:0
-#: field:hr.employee.category,complete_name:0
-msgid "Name"
+#: view:hr.installer:0
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
 msgstr ""
 
 #. module: hr
@@ -715,6 +741,11 @@ msgstr ""
 msgid "Coach"
 msgstr ""
 
+#. module: hr
+#: view:hr.installer:0
+msgid "Configure Your Human Resources Application"
+msgstr ""
+
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
@@ -728,6 +759,11 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
+#. module: hr
+#: model:hr.employee.marital.status,name:hr.hr_employee_marital_status_widower
+msgid "Widower"
+msgstr ""
+
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 50ab47217f4..8e0b59250ab 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-09-09 07:22+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-12-16 01:14+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
@@ -25,7 +25,7 @@ msgstr "系统用户"
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "必备条件"
 
 #. module: hr
 #: constraint:hr.department:0
@@ -56,12 +56,12 @@ msgstr "人力资源"
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于"
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "工作电邮"
 
 #. module: hr
 #: view:hr.employee:0
@@ -80,12 +80,12 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "标记为老的"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "职位空缺"
 
 #. module: hr
 #: view:hr.job:0
@@ -95,7 +95,7 @@ msgstr ""
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "职位"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -113,7 +113,7 @@ msgstr ""
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "假期"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
@@ -123,7 +123,7 @@ msgstr ""
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "员工婚姻状况"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -150,7 +150,7 @@ msgstr ""
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "我的部门雇员"
 
 #. module: hr
 #: constraint:hr.employee:0
@@ -161,12 +161,12 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "雇员护照信息"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "职位"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -215,7 +215,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "工作时间表列表"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
@@ -247,7 +247,7 @@ msgstr "子类"
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "职位描述"
 
 #. module: hr
 #: field:hr.employee,work_location:0
@@ -257,7 +257,7 @@ msgstr "办公地点"
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport"
-msgstr ""
+msgstr "护照"
 
 #. module: hr
 #: view:hr.employee:0
@@ -270,17 +270,17 @@ msgstr "员工"
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "其他信息"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "人力资源应用配置"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "出生日期"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -295,14 +295,14 @@ msgstr ""
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "人事管理一览表"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "工作"
 
 #. module: hr
 #: view:hr.department:0
@@ -318,7 +318,7 @@ msgstr "设置"
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "分类"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
@@ -328,7 +328,7 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "社会保险号"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -338,7 +338,7 @@ msgstr "上级分类"
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "错误！您不能创建循环分类。"
 
 #. module: hr
 #: view:hr.department:0
@@ -357,7 +357,7 @@ msgstr "员工联系方式"
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "我的面板"
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -379,12 +379,12 @@ msgstr "员工类别"
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "图片"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "劳动合同"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -406,7 +406,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "招聘流程"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
@@ -432,7 +432,7 @@ msgstr ""
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "员工工资帐号"
 
 #. module: hr
 #: field:hr.department,note:0
@@ -457,7 +457,7 @@ msgstr "工作地址"
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "人事经理一览表"
 
 #. module: hr
 #: view:hr.employee:0
@@ -475,7 +475,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "配置进度"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -486,12 +486,12 @@ msgstr "分类结构"
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "未知的"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "假期与请假管理"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
@@ -528,17 +528,17 @@ msgstr ""
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "老的"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "状态说明"
 
 #. module: hr
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "两个用户不能使用相同的用户名！"
 
 #. module: hr
 #: view:hr.job:0
@@ -568,7 +568,7 @@ msgstr ""
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "相片"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
@@ -588,7 +588,7 @@ msgstr "个人信息"
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "当前活动"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -600,7 +600,7 @@ msgstr ""
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: hr
 #: field:hr.department,parent_id:0
@@ -621,7 +621,7 @@ msgstr "家庭地址"
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr ""
+msgstr "考勤列表"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
@@ -675,12 +675,12 @@ msgstr ""
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "人事经理一览表"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "资源"
 
 #. module: hr
 #: field:hr.department,complete_name:0
@@ -707,7 +707,7 @@ msgstr "员工"
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "银行账户"
 
 #. module: hr
 #: field:hr.department,name:0
@@ -717,12 +717,12 @@ msgstr "部门名称"
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "社会安全号"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "创建 OpenERP 用户"
 
 #. module: hr
 #: field:hr.department,child_ids:0
@@ -733,7 +733,7 @@ msgstr "子部门"
 #: model:ir.actions.act_window,name:hr.action_hr_job
 #: model:ir.ui.menu,name:hr.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "职位"
 
 #. module: hr
 #: view:hr.employee:0
@@ -744,7 +744,7 @@ msgstr ""
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "支出"
 
 #. module: hr
 #: view:hr.department:0
diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py
index 9e8a4d84088..584340d6c1d 100644
--- a/addons/hr_attendance/hr_attendance.py
+++ b/addons/hr_attendance/hr_attendance.py
@@ -38,8 +38,6 @@ class hr_action_reason(osv.osv):
 hr_action_reason()
 
 def _employee_get(obj, cr, uid, context=None):
-    if context is None:
-        context = {}
     ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
     return ids and ids[0] or False
 
@@ -48,8 +46,6 @@ class hr_attendance(osv.osv):
     _description = "Attendance"
 
     def _day_compute(self, cr, uid, ids, fieldnames, args, context=None):
-        if context is None:
-            context = {}
         res = dict.fromkeys(ids, '')
         for obj in self.browse(cr, uid, ids, context=context):
             res[obj.id] = time.strftime('%Y-%m-%d', time.strptime(obj.name, '%Y-%m-%d %H:%M:%S'))
@@ -67,7 +63,7 @@ class hr_attendance(osv.osv):
         'employee_id': _employee_get,
     }
 
-    def _altern_si_so(self, cr, uid, ids):
+    def _altern_si_so(self, cr, uid, ids, context=None):
         for id in ids:
             sql = '''
             SELECT action, name
@@ -93,8 +89,6 @@ class hr_employee(osv.osv):
     _description = "Employee"
 
     def _state(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         result = {}
         if not ids:
             return result
@@ -120,16 +114,12 @@ class hr_employee(osv.osv):
     }
 
     def _action_check(self, cr, uid, emp_id, dt=False, context=None):
-        if context is None:
-            context = {}
         cr.execute('SELECT MAX(name) FROM hr_attendance WHERE employee_id=%s', (emp_id,))
         res = cr.fetchone()
         return not (res and (res[0]>=(dt or time.strftime('%Y-%m-%d %H:%M:%S'))))
 
     def attendance_action_change(self, cr, uid, ids, type='action', context=None, dt=False, *args):
         obj_attendance = self.pool.get('hr.attendance')
-        if context is None:
-            context = {}
         id = False
         warning_sign = 'sign'
         res = {}
diff --git a/addons/hr_attendance/i18n/fr.po b/addons/hr_attendance/i18n/fr.po
index cbbb7bea28e..3f437a8df79 100644
--- a/addons/hr_attendance/i18n/fr.po
+++ b/addons/hr_attendance/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-11-27 14:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 13:11+0000\n"
+"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
@@ -37,7 +37,7 @@ msgstr "Un pointage en sortie doit être précédé d'un pointage en entrée !"
 #. module: hr_attendance
 #: model:ir.ui.menu,name:hr_attendance.menu_hr_time_tracking
 msgid "Time Tracking"
-msgstr ""
+msgstr "Gestion du temps"
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -60,6 +60,8 @@ msgid ""
 "You did not sign out the last time. Please enter the date and time you "
 "signed out."
 msgstr ""
+"Vous n'avez pas pointé votre dernière sortie. Veuillez saisir la date et "
+"l'heure à laquelle vous êtes sorti."
 
 #. module: hr_attendance
 #: report:report.hr.timesheet.attendance.error:0
@@ -74,7 +76,7 @@ msgstr "Motif de pointage"
 #. module: hr_attendance
 #: view:hr.attendance.error:0
 msgid "Print Attendance Report Error"
-msgstr ""
+msgstr "Imprimer le rapport des erreurs de pointage"
 
 #. module: hr_attendance
 #: code:addons/hr_attendance/wizard/hr_attendance_sign_in_out.py:0
@@ -133,7 +135,7 @@ msgstr ""
 #. module: hr_attendance
 #: model:ir.actions.act_window,name:hr_attendance.action_hr_attendance_month
 msgid "Attendances By Month"
-msgstr ""
+msgstr "Présences par mois"
 
 #. module: hr_attendance
 #: field:hr.sign.in.out,name:0
@@ -258,6 +260,7 @@ msgstr "Mois"
 msgid ""
 "(*) A negative delay means that the employee worked more than encoded."
 msgstr ""
+"(*) Un délai négatif signifie que l'employé a travaillé plus qu'indiqué."
 
 #. module: hr_attendance
 #: help:hr.attendance,action_desc:0
@@ -270,7 +273,7 @@ msgstr ""
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_attendance_month
 msgid "Print Monthly Attendance Report"
-msgstr ""
+msgstr "Imprimer le rapport des présences mensuelles"
 
 #. module: hr_attendance
 #: model:ir.model,name:hr_attendance.model_hr_sign_in_out
@@ -342,7 +345,7 @@ msgstr "Octobre"
 #. module: hr_attendance
 #: view:hr.attendance:0
 msgid "My Attendances"
-msgstr ""
+msgstr "Mes présences"
 
 #. module: hr_attendance
 #: selection:hr.attendance.month,month:0
diff --git a/addons/hr_attendance/i18n/hr_attendance.pot b/addons/hr_attendance/i18n/hr_attendance.pot
index 7a70e1b0658..8150be3c841 100644
--- a/addons/hr_attendance/i18n/hr_attendance.pot
+++ b/addons/hr_attendance/i18n/hr_attendance.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:35+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:35+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:21+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_attendance/wizard/hr_attendance_bymonth.py b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
index 7d673b825f8..6f44729c01b 100644
--- a/addons/hr_attendance/wizard/hr_attendance_bymonth.py
+++ b/addons/hr_attendance/wizard/hr_attendance_bymonth.py
@@ -36,8 +36,6 @@ class hr_attendance_bymonth(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         datas = {
              'ids': [],
              'model': 'hr.employee',
diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek.py b/addons/hr_attendance/wizard/hr_attendance_byweek.py
index f969e88b66b..139ff94cd5a 100644
--- a/addons/hr_attendance/wizard/hr_attendance_byweek.py
+++ b/addons/hr_attendance/wizard/hr_attendance_byweek.py
@@ -35,8 +35,6 @@ class hr_attendance_byweek(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         datas = {
              'ids': [],
              'model': 'hr.employee',
diff --git a/addons/hr_attendance/wizard/hr_attendance_error.py b/addons/hr_attendance/wizard/hr_attendance_error.py
index c3b31bb6491..bb181268195 100644
--- a/addons/hr_attendance/wizard/hr_attendance_error.py
+++ b/addons/hr_attendance/wizard/hr_attendance_error.py
@@ -39,8 +39,6 @@ class hr_attendance_error(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         emp_ids = []
         data_error = self.read(cr, uid, ids, context=context)[0]
         date_from = data_error['init_date']
diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
index 09f9f9364c5..4e079584053 100644
--- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
+++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out.py
@@ -33,8 +33,6 @@ class hr_si_so_ask(osv.osv_memory):
         }
 
     def _get_empname(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
             employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0].name
@@ -53,14 +51,10 @@ class hr_si_so_ask(osv.osv_memory):
                  }
 
     def sign_in(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         return self.pool.get('hr.sign.in.out').sign_in(cr, uid, data, context)
 
     def sign_out(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         return self.pool.get('hr.sign.in.out').sign_out(cr, uid, data, context)
 
@@ -78,8 +72,6 @@ class hr_sign_in_out(osv.osv_memory):
                 }
 
     def _get_empid(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         emp_id = self.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
             employee = self.pool.get('hr.employee').browse(cr, uid, emp_id, context=context)[0]
@@ -87,8 +79,6 @@ class hr_sign_in_out(osv.osv_memory):
         return {}
 
     def default_get(self, cr, uid, fields_list, context=None):
-        if context is None:
-            context = {}
         res = super(hr_sign_in_out, self).default_get(cr, uid, fields_list, context=context)
         res_emp = self._get_empid(cr, uid, context=context)
         res.update(res_emp)
@@ -97,8 +87,6 @@ class hr_sign_in_out(osv.osv_memory):
     def si_check(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
         att_obj = self.pool.get('hr.attendance')
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         emp_id = data['emp_id']
         att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id)], limit=1, order='name desc')
@@ -124,8 +112,6 @@ class hr_sign_in_out(osv.osv_memory):
     def so_check(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
         att_obj = self.pool.get('hr.attendance')
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         emp_id = data['emp_id']
         att_id = att_obj.search(cr, uid, [('employee_id', '=', emp_id),('action', '!=', 'action')], limit=1, order='name desc')
@@ -177,8 +163,6 @@ class hr_sign_in_out(osv.osv_memory):
         return {} # To do: Return Success message
 
     def sign_out(self, cr, uid, data, context=None):
-        if context is None:
-            context = {}
         emp_id = data['emp_id']
         if 'last_time' in data:
             if data['last_time'] > time.strftime('%Y-%m-%d %H:%M:%S'):
diff --git a/addons/hr_contract/i18n/hr_contract.pot b/addons/hr_contract/i18n/hr_contract.pot
index e049e6be2e3..6431cbb60b7 100644
--- a/addons/hr_contract/i18n/hr_contract.pot
+++ b/addons/hr_contract/i18n/hr_contract.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:36+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:36+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:22+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_contract/i18n/zh_CN.po b/addons/hr_contract/i18n/zh_CN.po
index d056bad1327..06ec65b1c53 100644
--- a/addons/hr_contract/i18n/zh_CN.po
+++ b/addons/hr_contract/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-03 05:44+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
+"PO-Revision-Date: 2010-12-16 01:18+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
@@ -29,12 +29,12 @@ msgstr "总数"
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Trial Period"
-msgstr ""
+msgstr "试用期"
 
 #. module: hr_contract
 #: field:hr.contract,trial_date_start:0
 msgid "Trial Start Date"
-msgstr ""
+msgstr "使用期开始日期"
 
 #. module: hr_contract
 #: view:hr.employee:0
@@ -44,12 +44,12 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Medical Examination"
-msgstr ""
+msgstr "体检"
 
 #. module: hr_contract
 #: field:hr.employee,vehicle:0
 msgid "Company Vehicle"
-msgstr ""
+msgstr "公司车辆"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,name:0
@@ -59,17 +59,17 @@ msgstr "工资类型名称"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Miscellaneous"
-msgstr ""
+msgstr "其它"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Current"
-msgstr ""
+msgstr "当前的"
 
 #. module: hr_contract
 #: field:hr.contract,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "部门"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -84,12 +84,12 @@ msgstr "工资类型"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Calculations"
-msgstr ""
+msgstr "计算"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
 msgid "Basic"
-msgstr ""
+msgstr "基本信息"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -102,7 +102,7 @@ msgstr "员工"
 #: view:hr.contract:0
 #: field:hr.contract,working_hours:0
 msgid "Working Schedule"
-msgstr ""
+msgstr "工作安排"
 
 #. module: hr_contract
 #: selection:hr.contract.wage.type,type:0
@@ -128,12 +128,12 @@ msgstr "职能"
 #: view:hr.contract:0
 #: view:hr.contract.wage.type:0
 msgid "Group By..."
-msgstr ""
+msgstr "分组于"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #. module: hr_contract
 #: field:hr.employee,place_of_birth:0
@@ -153,33 +153,33 @@ msgstr "合同"
 #. module: hr_contract
 #: field:hr.employee,manager:0
 msgid "Is a Manager"
-msgstr ""
+msgstr "是否是经理"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Job"
-msgstr ""
+msgstr "工作"
 
 #. module: hr_contract
 #: view:hr.contract:0
 #: view:hr.employee:0
 msgid "Passport"
-msgstr ""
+msgstr "护照"
 
 #. module: hr_contract
 #: view:hr.contract:0
 msgid "Search Contract"
-msgstr ""
+msgstr "搜索合同"
 
 #. module: hr_contract
 #: help:hr.employee,contract_id:0
 msgid "Latest contract of the employee"
-msgstr ""
+msgstr "该雇员最近的合同"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_net:0
 msgid "Deductions"
-msgstr ""
+msgstr "扣除"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,name:0
@@ -191,7 +191,7 @@ msgstr "周期名称"
 #: field:hr.contract,advantages:0
 #: view:hr.employee:0
 msgid "Advantages"
-msgstr ""
+msgstr "优点"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -208,23 +208,23 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.employee,children:0
 msgid "Number of Children"
-msgstr ""
+msgstr "子女数"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
 #: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
 msgid "Contract Types"
-msgstr ""
+msgstr "合同类型"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
 msgid "Search Wage Type"
-msgstr ""
+msgstr "搜索薪酬类型"
 
 #. module: hr_contract
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "错误！您不能创建循环的员工等级。"
 
 #. module: hr_contract
 #: field:hr.contract,date_end:0
@@ -239,12 +239,12 @@ msgstr "工资"
 #. module: hr_contract
 #: field:hr.contract,name:0
 msgid "Contract Reference"
-msgstr ""
+msgstr "合同引用"
 
 #. module: hr_contract
 #: help:hr.employee,vehicle_distance:0
 msgid "In kilometers"
-msgstr ""
+msgstr "单位：千米"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -293,12 +293,12 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary Computation"
-msgstr ""
+msgstr "薪酬计算"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Job Info"
-msgstr ""
+msgstr "招聘信息"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,period_id:0
@@ -310,7 +310,7 @@ msgstr "工资周期"
 #. module: hr_contract
 #: field:hr.contract,job_id:0
 msgid "Job Title"
-msgstr ""
+msgstr "职位"
 
 #. module: hr_contract
 #: model:ir.actions.act_window,name:hr_contract.action_hr_contract_wage_type_period
@@ -321,7 +321,7 @@ msgstr "工资周期"
 #. module: hr_contract
 #: field:hr.employee,vehicle_distance:0
 msgid "Home-Work Distance"
-msgstr ""
+msgstr "通勤距离"
 
 #. module: hr_contract
 #: field:hr.contract,date_start:0
@@ -331,7 +331,7 @@ msgstr "开始日期"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Company contribution"
-msgstr ""
+msgstr "公司贡献"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,type:0
@@ -341,7 +341,7 @@ msgstr "类型"
 #. module: hr_contract
 #: field:hr.contract,trial_date_end:0
 msgid "Trial End Date"
-msgstr ""
+msgstr "试用期截至日期"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type,factor_type:0
@@ -366,12 +366,12 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Contract Details"
-msgstr ""
+msgstr "合同明细"
 
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Salary Structure"
-msgstr ""
+msgstr "薪酬结构"
 
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
@@ -384,7 +384,7 @@ msgstr "这字段使用时间表系统来计算合同员工的每小时工价"
 #. module: hr_contract
 #: view:hr.employee:0
 msgid "Personal Info"
-msgstr ""
+msgstr "个人信息"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -395,12 +395,12 @@ msgstr ""
 #. module: hr_contract
 #: field:hr.employee,medic_exam:0
 msgid "Medical Examination Date"
-msgstr ""
+msgstr "体检日期"
 
 #. module: hr_contract
 #: field:hr.contract,advantages_gross:0
 msgid "Allowances"
-msgstr ""
+msgstr "津贴"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -410,7 +410,7 @@ msgstr ""
 #. module: hr_contract
 #: view:hr.contract.type:0
 msgid "Search Contract Type"
-msgstr ""
+msgstr "搜索合同类型"
 
 #~ msgid "Miscelleanous"
 #~ msgstr "杂项"
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 32478f515a0..58631761fa9 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -106,8 +106,6 @@ class hr_employee(osv.osv):
 
     def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None):
         obj_evaluation = self.pool.get('hr_evaluation.evaluation')
-        if context is None:
-            context = {}
         for id in self.browse(cr, uid, self.search(cr, uid, [], context=context), context=context):
             if id.evaluation_plan_id and id.evaluation_date:
                 if (parser.parse(id.evaluation_date) + relativedelta(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
@@ -116,8 +114,6 @@ class hr_employee(osv.osv):
         return True
 
     def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None):
-        if context is None:
-            context = {}
         if evaluation_plan_id:
             evaluation_plan_obj=self.pool.get('hr_evaluation.plan')
             obj_evaluation = self.pool.get('hr_evaluation.evaluation')
@@ -135,8 +131,6 @@ class hr_employee(osv.osv):
         return {'value': {'evaluation_date': evaluation_date}}
 
     def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
         id = super(hr_employee, self).create(cr, uid, vals, context=context)
         if vals.get('evaluation_plan_id', False):
             self.pool.get('hr_evaluation.evaluation').create(cr, uid, {'employee_id': id, 'plan_id': vals['evaluation_plan_id']}, context=context)
@@ -180,8 +174,6 @@ class hr_evaluation(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         if not ids:
             return []
         reads = self.browse(cr, uid, ids, context=context)
@@ -192,8 +184,6 @@ class hr_evaluation(osv.osv):
         return res
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
-        if context is None:
-            context = {}
         evaluation_plan_id=False
         if employee_id:
             employee_obj=self.pool.get('hr.employee')
@@ -246,8 +236,6 @@ class hr_evaluation(osv.osv):
 
     def button_final_validation(self, cr, uid, ids, context=None):
         request_obj = self.pool.get('hr.evaluation.interview')
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'progress'}, context=context)
         for id in self.browse(cr, uid, ids, context=context):
             if len(id.survey_request_ids) != len(request_obj.search(cr, uid, [('evaluation_id', '=', id.id),('state', '=', 'done')], context=context)):
@@ -255,21 +243,15 @@ class hr_evaluation(osv.osv):
         return True
 
     def button_done(self,cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids,{'progress': 1 * 100}, context=context)
         self.write(cr, uid, ids,{'state':'done', 'date_close': time.strftime('%Y-%m-%d')}, context=context)
         return True
 
     def button_cancel(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids,{'state':'cancel'}, context=context)
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
-        if context is None:
-            context = {}
         if 'date' in vals:
             new_vals = {'date_deadline': vals.get('date')}
             obj_hr_eval_iterview = self.pool.get('hr.evaluation.interview')
@@ -306,8 +288,6 @@ class hr_evaluation_interview(osv.osv):
     }
 
     def name_get(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         if not ids:
             return []
         reads = self.browse(cr, uid, ids, context=context)
@@ -318,15 +298,11 @@ class hr_evaluation_interview(osv.osv):
         return res
 
     def survey_req_waiting_answer(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, { 'state': 'waiting_answer'}, context=context)
         return True
 
     def survey_req_done(self, cr, uid, ids, context=None):
         hr_eval_obj = self.pool.get('hr_evaluation.evaluation')
-        if context is None:
-            context = {}
         for id in self.browse(cr, uid, ids, context=context):
             flag = False
             wating_id = 0
@@ -349,14 +325,10 @@ class hr_evaluation_interview(osv.osv):
         return True
 
     def survey_req_draft(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, { 'state': 'draft'}, context=context)
         return True
 
     def survey_req_cancel(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, { 'state': 'cancel'}, context=context)
         return True
 
@@ -371,12 +343,12 @@ class hr_evaluation_interview(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary value for print survey form.
         """
-        if not context:
+        if context is None:
             context = {}
         record = self.browse(cr, uid, ids, context=context)
         record = record and record[0]
         context.update({'survey_id': record.survey_id.id, 'response_id': [record.response.id], 'response_no':0,})
-        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
+        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
         return value
 
 hr_evaluation_interview()
diff --git a/addons/hr_evaluation/i18n/fr.po b/addons/hr_evaluation/i18n/fr.po
index 881e66549bd..4cd27220dfc 100644
--- a/addons/hr_evaluation/i18n/fr.po
+++ b/addons/hr_evaluation/i18n/fr.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-11 17:32+0000\n"
-"Last-Translator: lolivier <olivier.lenoir@free.fr>\n"
+"PO-Revision-Date: 2010-12-15 20:42+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_evaluation
@@ -226,6 +227,21 @@ msgid ""
 "\n"
 "        "
 msgstr ""
+"\n"
+"Date: %(date)s\n"
+"\n"
+"Cher(e) %(employee_name)s,\n"
+"\n"
+"Je fais une évaluation concernant %(eval_name)s.\n"
+"\n"
+"Veuillez soumettre votre réponse.\n"
+"\n"
+"\n"
+"Merci,\n"
+"--\n"
+"%(user_signature)s\n"
+"\n"
+"        "
 
 #. module: hr_evaluation
 #: view:hr_evaluation.plan.phase:0
diff --git a/addons/hr_evaluation/i18n/hr_evaluation.pot b/addons/hr_evaluation/i18n/hr_evaluation.pot
index 13269cd27b6..f1e7419848d 100644
--- a/addons/hr_evaluation/i18n/hr_evaluation.pot
+++ b/addons/hr_evaluation/i18n/hr_evaluation.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:36+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:36+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:22+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_evaluation/wizard/hr_evaluation_mail.py b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
index 3464c4beaee..17ad7415cb5 100644
--- a/addons/hr_evaluation/wizard/hr_evaluation_mail.py
+++ b/addons/hr_evaluation/wizard/hr_evaluation_mail.py
@@ -30,8 +30,6 @@ class hr_evaluation_reminder(osv.osv_memory):
 
     def send_mail(self, cr, uid, ids, context=None):
         hr_evaluation_interview_obj = self.pool.get('hr.evaluation.interview')
-        if context is None:
-            context = {}
         evaluation_data = self.read(cr, uid, ids, context=context)[0]
         current_interview = hr_evaluation_interview_obj.browse(cr, uid, evaluation_data.get('evaluation_id'))
         if current_interview.state == "waiting_answer" and current_interview.user_to_review_id.work_email :
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 2b72b90218f..acec2f3a240 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -43,15 +43,11 @@ class hr_expense_expense(osv.osv):
         return super(hr_expense_expense, self).copy(cr, uid, id, default, context=context)
 
     def _amount(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
         cr.execute("SELECT s.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_expense s LEFT OUTER JOIN hr_expense_line l ON (s.id=l.expense_id) WHERE s.id IN %s GROUP BY s.id ", (tuple(ids),))
         res = dict(cr.fetchall())
         return res
 
     def _get_currency(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         user = self.pool.get('res.users').browse(cr, uid, [uid], context=context)[0]
         if user.company_id:
             return user.company_id.currency_id.id
@@ -101,7 +97,7 @@ class hr_expense_expense(osv.osv):
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
         department_id = False
         if employee_id:
-            department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id).department_id.id or False
+            department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).department_id.id or False
         return {'value':{'department_id':department_id}}
 
     def expense_confirm(self, cr, uid, ids, *args):
@@ -217,8 +213,6 @@ class hr_expense_line(osv.osv):
     _description = "Expense Line"
 
     def _amount(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
         if not ids:
             return {}
         cr.execute("SELECT l.id,COALESCE(SUM(l.unit_amount*l.unit_quantity),0) AS amount FROM hr_expense_line l WHERE id IN %s GROUP BY l.id ",(tuple(ids),))
@@ -246,8 +240,6 @@ class hr_expense_line(osv.osv):
     _order = "sequence, date_value desc"
 
     def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
-        if context is None:
-            context = {}
         res = {}
         if product_id:
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
diff --git a/addons/hr_expense/i18n/hr_expense.pot b/addons/hr_expense/i18n/hr_expense.pot
index 47419d17072..483e15a3d0c 100644
--- a/addons/hr_expense/i18n/hr_expense.pot
+++ b/addons/hr_expense/i18n/hr_expense.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:37+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:37+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:23+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:23+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index f5896f3a722..314e053ac12 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -36,8 +36,6 @@ class hr_holidays_status(osv.osv):
     _description = "Leave Type"
 
     def get_days_cat(self, cr, uid, ids, category_id, return_false, context=None):
-        if context is None:
-            context = {}
 
         cr.execute("""SELECT id, type, number_of_days, holiday_status_id FROM hr_holidays WHERE category_id = %s AND state='validate' AND holiday_status_id in %s""",
             [category_id, tuple(ids)])
@@ -61,8 +59,6 @@ class hr_holidays_status(osv.osv):
         return res
 
     def get_days(self, cr, uid, ids, employee_id, return_false, context=None):
-        if context is None:
-            context = {}
 
         cr.execute("""SELECT id, type, number_of_days, holiday_status_id FROM hr_holidays WHERE employee_id = %s AND state='validate' AND holiday_status_id in %s""",
             [employee_id, tuple(ids)])
@@ -86,8 +82,6 @@ class hr_holidays_status(osv.osv):
         return res
 
     def _user_left_days(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         return_false = False
         employee_id = False
         res = {}
@@ -133,8 +127,6 @@ class hr_holidays(osv.osv):
     _order = "type desc, date_from asc"
 
     def _employee_get(obj, cr, uid, context=None):
-        if context is None:
-            context = {}
         ids = obj.pool.get('hr.employee').search(cr, uid, [('user_id', '=', uid)], context=context)
         if ids:
             return ids[0]
@@ -177,16 +169,12 @@ class hr_holidays(osv.osv):
 
     def _create_resource_leave(self, cr, uid, vals, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays validated '''
-        if context is None:
-            context = {}
         obj_res_leave = self.pool.get('resource.calendar.leaves')
         return obj_res_leave.create(cr, uid, vals, context=context)
 
     def _remove_resouce_leave(self, cr, uid, ids, context=None):
         '''This method will create entry in resource calendar leave object at the time of holidays cancel/removed'''
         obj_res_leave = self.pool.get('resource.calendar.leaves')
-        if context is None:
-            context = {}
         leave_ids = obj_res_leave.search(cr, uid, [('holiday_id', 'in', ids)], context=context)
         return obj_res_leave.unlink(cr, uid, leave_ids)
 
@@ -205,8 +193,6 @@ class hr_holidays(osv.osv):
         return super(hr_holidays, self).create(cr, uid, vals, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
-        if context is None:
-            context = {}
         if 'holiday_type' in vals:
             if vals['holiday_type'] == 'employee':
                 vals.update({'category_id': False})
@@ -245,7 +231,7 @@ class hr_holidays(osv.osv):
                     self.holidays_cancel(cr, uid, list_ids)
                     self.unlink(cr, uid, list_ids)
 
-    def _check_date(self, cr, uid, ids):
+    def _check_date(self, cr, uid, ids, context=None):
         for rec in self.read(cr, uid, ids, ['number_of_days_temp', 'date_from','date_to', 'type']):
             if rec['number_of_days_temp'] < 0:
                 return False
@@ -260,8 +246,6 @@ class hr_holidays(osv.osv):
     _constraints = [(_check_date, 'Start date should not be larger than end date!\nNumber of Days should be greater than 1!', ['number_of_days_temp'])]
 
     def unlink(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self._update_user_holidays(cr, uid, ids)
         self._remove_resouce_leave(cr, uid, ids, context=context)
         return super(hr_holidays, self).unlink(cr, uid, ids, context)
@@ -283,8 +267,6 @@ class hr_holidays(osv.osv):
         return self.onchange_date_from(cr, uid, ids, date_to, date_from)
 
     def onchange_sec_id(self, cr, uid, ids, status, context=None):
-        if context is None:
-            context = {}
         warning = {}
         if status:
             brows_obj = self.pool.get('hr.holidays.status').browse(cr, uid, [status], context=context)[0]
diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po
index 1ec6295b6ae..d87ad1d3380 100644
--- a/addons/hr_holidays/i18n/fr.po
+++ b/addons/hr_holidays/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 09:23+0000\n"
+"PO-Revision-Date: 2010-12-15 20:45+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:09+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
@@ -84,7 +84,7 @@ msgstr "Catégorie d'employé"
 #. module: hr_holidays
 #: selection:hr.holidays,allocation_type:0
 msgid "Company Allocation"
-msgstr ""
+msgstr "Allocation de l'entreprise"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -199,7 +199,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Validation"
-msgstr ""
+msgstr "Validation"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -214,6 +214,8 @@ msgid ""
 "You cannot validate leaves for category %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Vous ne pouvez pas valider de congés pour la catégorie %s tant qu'il y a "
+"plusieurs jours de congés en attente."
 
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
@@ -298,6 +300,8 @@ msgid ""
 "This field is only for informative purposes, to depict if the leave "
 "request/allocation comes from an employee or from the company"
 msgstr ""
+"Ce champ est seulement à titre informatif, pour illustrer si une "
+"requête/attribution de congé vient d'un employé ou de la société."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -307,7 +311,7 @@ msgstr "Confirmer"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_available_holidays_report
 msgid "available.holidays.report"
-msgstr ""
+msgstr "available.holiday.report"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -414,6 +418,7 @@ msgstr "Blé"
 #: constraint:resource.calendar.leaves:0
 msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
+"Erreur ! La date de départ en congé doit être inférieure à la date de retour."
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -436,7 +441,7 @@ msgstr "Congés restants par type et utilisateur"
 #. module: hr_holidays
 #: view:hr.holidays.status:0
 msgid "Search Leave Type"
-msgstr ""
+msgstr "Rechercher un type d'absence"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
@@ -470,7 +475,7 @@ msgstr " Mois "
 #. module: hr_holidays
 #: view:board.board:0
 msgid "Leaves By Month"
-msgstr ""
+msgstr "Absences par mois"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -479,6 +484,8 @@ msgid ""
 "You cannot validate leaves for employee %s while there are too few remaining "
 "leave days."
 msgstr ""
+"Vous ne pouvez pas valider des absences pour l'employé %s tant qu'il y a des "
+"absences en attente."
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
diff --git a/addons/hr_holidays/i18n/hr_holidays.pot b/addons/hr_holidays/i18n/hr_holidays.pot
index e6c8159f18b..a4e18c22646 100644
--- a/addons/hr_holidays/i18n/hr_holidays.pot
+++ b/addons/hr_holidays/i18n/hr_holidays.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:38+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:38+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:24+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index b7f206b22ab..f21dca92393 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -39,8 +39,6 @@ class hr_holidays_summary_dept(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         if not data['depts']:
             raise osv.except_osv(_('Error'), _('You have to select at least 1 Department. And try again'))
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 984a1f51e4b..b6aeee96b00 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -37,8 +37,6 @@ class hr_holidays_summary_employee(osv.osv_memory):
     }
 
     def print_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         data['emp'] = context['active_ids']
         datas = {
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py
index 851e3994348..2319b3a352c 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/hr_payroll.py
@@ -114,8 +114,6 @@ class hr_payroll_structure(osv.osv):
 
         @return: returns a id of newly created record
         """
-        if context is None:
-            context = {}
         code = self.browse(cr, uid, id, context=context).code
         default = {
             'code':code+"(copy)",
@@ -131,13 +129,15 @@ class hr_contract(osv.osv):
     allowas to configure different Salary structure
     """
 
-    def compute_basic(self, cr, uid, ids, context={}):
+    def compute_basic(self, cr, uid, ids, context=None):
         res = {}
+        if context is None:
+            context = {}
         ids += context.get('employee_structure', [])
 
         slip_line_pool = self.pool.get('hr.payslip.line')
 
-        for contract in self.browse(cr, uid, ids, context):
+        for contract in self.browse(cr, uid, ids, context=context):
             all_per = 0.0
             ded_per = 0.0
             all_fix = 0.0
@@ -246,7 +246,7 @@ class hr_contract(osv.osv):
         return False
 
     def _calculate_salary(self, cr, uid, ids, field_names, arg, context=None):
-        res = self.compute_basic(cr, uid, ids, context)
+        res = self.compute_basic(cr, uid, ids, context=context)
         vals = {}
         for rs in self.browse(cr, uid, ids, context=context):
             allow = 0.0
@@ -422,20 +422,14 @@ class payroll_register(osv.osv):
         return True
 
     def set_to_draft(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'draft'}, context=context)
         return True
 
     def cancel_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
 
     def verify_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         slip_pool = self.pool.get('hr.payslip')
 
         for id in ids:
@@ -453,8 +447,6 @@ class payroll_register(osv.osv):
         advice_line_pool = self.pool.get('hr.payroll.advice.line')
         sequence_pool = self.pool.get('ir.sequence')
         users_pool = self.pool.get('res.users')
-        if context is None:
-            context = {}
 
         for id in ids:
             sids = slip_pool.search(cr, uid, [('register_id','=',id), ('state','=','hr_check')], context=context)
@@ -531,27 +523,19 @@ class payroll_advice(osv.osv):
     }
 
     def confirm_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'confirm'}, context=context)
         return True
 
     def set_to_draft(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'draft'}, context=context)
         return True
 
     def cancel_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
 
     def onchange_company_id(self, cr, uid, ids, company_id=False, context=None):
         res = {}
-        if context is None:
-            context = {}
         if company_id:
             company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
             if company.partner_id.bank_ids:
@@ -583,8 +567,6 @@ class payroll_advice_line(osv.osv):
     def onchange_employee_id(self, cr, uid, ids, ddate, employee_id, context=None):
         vals = {}
         slip_pool = self.pool.get('hr.payslip')
-        if context is None:
-            context = {}
         if employee_id:
             dates = prev_bounds(ddate)
             sids = False
@@ -607,7 +589,7 @@ class contrib_register(osv.osv):
     _name = 'hr.contibution.register'
     _description = 'Contribution Register'
 
-    def _total_contrib(self, cr, uid, ids, field_names, arg, context={}):
+    def _total_contrib(self, cr, uid, ids, field_names, arg, context=None):
         line_pool = self.pool.get('hr.contibution.register.line')
 
         res = {}
@@ -648,8 +630,6 @@ class contrib_register_line(osv.osv):
     _description = 'Contribution Register Line'
 
     def _total(self, cr, uid, ids, field_names, arg, context=None):
-        if context is None:
-            context = {}
         res={}
         for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.emp_deduction + line.comp_deduction
@@ -761,8 +741,6 @@ class company_contribution(osv.osv):
         uid: user id of current executer
         """
         line_pool = self.pool.get('company.contribution.line')
-        if context is None:
-            context = {}
         res = 0
         ids = line_pool.search(cr, uid, [('category_id','=',id), ('to_val','>=',value),('from_val','<=',value)], context=context)
         if not ids:
@@ -773,8 +751,8 @@ class company_contribution(osv.osv):
             res = line_pool.browse(cr, uid, ids, context=context)[0].value
         return res
 
-    def compute(self, cr, uid, id, value, context={}):
-        contrib = self.browse(cr, uid, id, context)
+    def compute(self, cr, uid, id, value, context=None):
+        contrib = self.browse(cr, uid, id, context=context)
         if contrib.amount_type == 'fix':
             return contrib.contribute_per
         elif contrib.amount_type == 'per':
@@ -837,8 +815,6 @@ class hr_payslip(osv.osv):
 
     def _calculate(self, cr, uid, ids, field_names, arg, context=None):
         slip_line_obj = self.pool.get('hr.payslip.line')
-        if context is None:
-            context = {}
         res = {}
         for rs in self.browse(cr, uid, ids, context=context):
             allow = 0.0
@@ -933,8 +909,6 @@ class hr_payslip(osv.osv):
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if context is None:
-            context = {}
         company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         default = {
             'line_ids': False,
@@ -961,36 +935,26 @@ class hr_payslip(osv.osv):
             slip_move.create(cr, uid, res)
 
     def set_to_draft(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'draft'}, context=context)
         return True
 
     def cancel_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
 
     def account_check_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'accont_check'}, context=context)
         return True
 
     def hr_check_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'hr_check'}, context=context)
         return True
 
     def process_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'paid':True, 'state':'done'}, context=context)
         return True
 
-    def verify_sheet(self, cr, uid, ids, context={}):
+    def verify_sheet(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('company.contribution')
         register_line_pool = self.pool.get('hr.contibution.register.line')
 
@@ -1021,8 +985,6 @@ class hr_payslip(osv.osv):
         return True
 
     def get_contract(self, cr, uid, employee, date, context=None):
-        if context is None:
-            context = {}
         sql_req= '''
             SELECT c.id as id, c.wage as wage, struct_id as function
             FROM hr_contract c
@@ -1053,8 +1015,6 @@ class hr_payslip(osv.osv):
 
         @return: return a result
         """
-        if context is None:
-            context = {}
         result = []
 
         dates = prev_bounds(slip.date)
@@ -1379,8 +1339,6 @@ class hr_payslip_line(osv.osv):
     }
 
     def execute_function(self, cr, uid, id, value, context=None):
-        if context is None:
-            context = {}
         line_pool = self.pool.get('hr.payslip.line.line')
         res = 0
         ids = line_pool.search(cr, uid, [('slipline_id','=',id), ('from_val','<=',value), ('to_val','>=',value)], context=context)
@@ -1427,7 +1385,7 @@ class hr_employee(osv.osv):
         vals = {}
         slip_line_pool = self.pool.get('hr.payslip.line')
 
-        for employee in self.browse(cr, uid, ids, context):
+        for employee in self.browse(cr, uid, ids, context=context):
             if not employee.contract_id:
                 vals[employee.id] = {'basic':0.0, 'gross':0.0, 'net':0.0, 'advantages_gross':0.0, 'advantages_net':0.0}
                 continue
diff --git a/addons/hr_payroll/i18n/hr_payroll.pot b/addons/hr_payroll/i18n/hr_payroll.pot
index e2020f5471d..98a92e7cf76 100644
--- a/addons/hr_payroll/i18n/hr_payroll.pot
+++ b/addons/hr_payroll/i18n/hr_payroll.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:39+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:39+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:26+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_payroll/i18n/pt.po b/addons/hr_payroll/i18n/pt.po
index 9fa20b47b9c..5f0dcfd6295 100644
--- a/addons/hr_payroll/i18n/pt.po
+++ b/addons/hr_payroll/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 12:54+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 23:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 43788c25f7b..adf1fada169 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -104,16 +104,16 @@ class payroll_register(osv.osv):
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
     }
 
-    def compute_sheet(self, cr, uid, ids, context={}):
+    def compute_sheet(self, cr, uid, ids, context=None):
         emp_pool = self.pool.get('hr.employee')
         slip_pool = self.pool.get('hr.payslip')
         func_pool = self.pool.get('hr.payroll.structure')
         slip_line_pool = self.pool.get('hr.payslip.line')
         wf_service = netsvc.LocalService("workflow")
-        vals = self.browse(cr, uid, ids)[0]
+        vals = self.browse(cr, uid, ids, context=context)[0]
         emp_ids = emp_pool.search(cr, uid, [])
 
-        for emp in emp_pool.browse(cr, uid, emp_ids):
+        for emp in emp_pool.browse(cr, uid, emp_ids, context=context):
             old_slips = slip_pool.search(cr, uid, [('employee_id','=', emp.id), ('date','=',vals.date)])
             if old_slips:
                 slip_pool.write(cr, uid, old_slips, {'register_id':ids[0]})
@@ -151,24 +151,24 @@ class contrib_register(osv.osv):
     _inherit = 'hr.contibution.register'
     _description = 'Contribution Register'
 
-    def _total_contrib(self, cr, uid, ids, field_names, arg, context={}):
+    def _total_contrib(self, cr, uid, ids, field_names, arg, context=None):
         line_pool = self.pool.get('hr.contibution.register.line')
         period_id = self.pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d')),('date_stop','>=',time.strftime('%Y-%m-%d'))])[0]
-        fiscalyear_id = self.pool.get('account.period').browse(cr, uid, period_id).fiscalyear_id
+        fiscalyear_id = self.pool.get('account.period').browse(cr, uid, period_id, context=context).fiscalyear_id
         res = {}
-        for cur in self.browse(cr, uid, ids):
+        for cur in self.browse(cr, uid, ids, context=context):
             current = line_pool.search(cr, uid, [('period_id','=',period_id),('register_id','=',cur.id)])
             years = line_pool.search(cr, uid, [('period_id.fiscalyear_id','=',fiscalyear_id.id), ('register_id','=',cur.id)])
 
             e_month = 0.0
             c_month = 0.0
-            for i in line_pool.browse(cr, uid, current):
+            for i in line_pool.browse(cr, uid, current, context=context):
                 e_month += i.emp_deduction
                 c_month += i.comp_deduction
 
             e_year = 0.0
             c_year = 0.0
-            for j in line_pool.browse(cr, uid, years):
+            for j in line_pool.browse(cr, uid, years, context=context):
                 e_year += i.emp_deduction
                 c_year += i.comp_deduction
 
@@ -235,8 +235,6 @@ class hr_payslip(osv.osv):
     def cancel_sheet(self, cr, uid, ids, context=None):
         move_pool = self.pool.get('account.move')
         slip_move = self.pool.get('hr.payslip.account.move')
-        if context is None:
-            context = {}
         move_ids = []
         for slip in self.browse(cr, uid, ids, context=context):
             for line in slip.move_ids:
@@ -256,8 +254,6 @@ class hr_payslip(osv.osv):
         invoice_pool = self.pool.get('account.invoice')
         fiscalyear_pool = self.pool.get('account.fiscalyear')
         period_pool = self.pool.get('account.period')
-        if context is None:
-            context = {}
 
         for slip in self.browse(cr, uid, ids, context=context):
             line_ids = []
@@ -398,14 +394,10 @@ class hr_payslip(osv.osv):
         return True
 
     def account_check_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'accont_check'}, context=context)
         return True
 
     def hr_check_sheet(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'hr_check'}, context=context)
         return True
 
@@ -418,8 +410,6 @@ class hr_payslip(osv.osv):
         property_pool = self.pool.get('ir.property')
         payslip_pool = self.pool.get('hr.payslip.line')
 
-        if context is None:
-            context = {}
         for slip in self.browse(cr, uid, ids, context=context):
             total_deduct = 0.0
 
diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 9ab5f7abe0d..e8d5bd21523 100644
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:40+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:40+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:26+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_payroll_account/i18n/pt.po b/addons/hr_payroll_account/i18n/pt.po
index a6800c82d82..9d0b3edcf73 100644
--- a/addons/hr_payroll_account/i18n/pt.po
+++ b/addons/hr_payroll_account/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 19:12+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 17:38+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_payroll_account/i18n/sv.po b/addons/hr_payroll_account/i18n/sv.po
index 3af49a09ec5..7279e1dd2fb 100644
--- a/addons/hr_payroll_account/i18n/sv.po
+++ b/addons/hr_payroll_account/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 20:11+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 11:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:35+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_payroll_account
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index fcbb0ffbb5c..7aebc3ef268 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -82,8 +82,6 @@ class hr_applicant(crm.crm_case, osv.osv):
     _inherit = ['mailgate.thread']
 
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
-        if context is None:
-            context = {}
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -165,8 +163,6 @@ class hr_applicant(crm.crm_case, osv.osv):
     }
 
     def _get_stage(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         ids = self.pool.get('hr.recruitment.stage').search(cr, uid, [], context=context)
         return ids and ids[0] or False
 
@@ -181,8 +177,6 @@ class hr_applicant(crm.crm_case, osv.osv):
     }
 
     def onchange_job(self,cr, uid, ids, job, context=None):
-        if context is None:
-            context = {}
         result = {}
 
         if job:
@@ -200,8 +194,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
         stage_obj = self.pool.get('hr.recruitment.stage')
-        if not context:
-            context = {}
         for case in self.browse(cr, uid, ids, context=context):
             department = (case.department_id.id or False)
             st = case.stage_id.id  or False
@@ -219,8 +211,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param ids: List of case IDs
         @param context: A standard dictionary for contextual values"""
         stage_obj = self.pool.get('hr.recruitment.stage')
-        if not context:
-            context = {}
         for case in self.browse(cr, uid, ids, context=context):
             department = (case.department_id.id or False)
             st = case.stage_id.id  or False
@@ -291,12 +281,12 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param context: A standard dictionary for contextual values
         @return: Dictionary value for print survey form.
         """
-        if not context:
+        if context is None:
             context = {}
         record = self.browse(cr, uid, ids, context=context)
         record = record and record[0]
         context.update({'survey_id': record.survey.id, 'response_id': [record.response], 'response_no': 0, })
-        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context)
+        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
         return value
 
     def message_new(self, cr, uid, msg, context=None):
@@ -309,8 +299,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         """
         mailgate_pool = self.pool.get('email.server.tools')
         attach_obj = self.pool.get('ir.attachment')
-        if context is None:
-            context = {}
 
         subject = msg.get('subject')
         body = msg.get('body')
@@ -353,8 +341,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         @param uid: the current user’s ID for security checks,
         @param ids: List of update mail’s IDs
         """
-        if context is None:
-            context = {}
 
         if isinstance(ids, (str, int, long)):
             ids = [ids]
diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 8c1a20f60bf..a153d4007a4 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:41+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:41+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:27+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_recruitment/i18n/sv.po b/addons/hr_recruitment/i18n/sv.po
index eb9fb00698d..87d40da7cd4 100644
--- a/addons/hr_recruitment/i18n/sv.po
+++ b/addons/hr_recruitment/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 07:34+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-16 00:45+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 08d749ecfd1..ecb6a7cb3a4 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -38,14 +38,14 @@ class job2phonecall(osv.osv_memory):
         case_obj = self.pool.get('hr.applicant')
         if context is None:
             context = {}
-        case = case_obj.browse(cr, uid, context['active_id'], context=context)
+        case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
         return case.user_id and case.user_id.id or False
 
     def _date_category(self, cr, uid, context=None):
         case_obj = self.pool.get('hr.applicant')
         if context is None:
             context = {}
-        case = case_obj.browse(cr, uid, context['active_id'], context=context)
+        case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
         categ_id = self.pool.get('crm.case.categ').search(cr, uid, [('name','=','Outbound')], context=context)
         return categ_id and categ_id[0] or case.categ_id and case.categ_id.id or False
 
@@ -53,7 +53,7 @@ class job2phonecall(osv.osv_memory):
         case_obj = self.pool.get('hr.applicant')
         if context is None:
             context = {}
-        case = case_obj.browse(cr, uid, context['active_id'], context=context)
+        case = case_obj.browse(cr, uid, context.get('active_id', False), context=context)
         return case.description or ''
 
     _defaults = {
@@ -81,7 +81,7 @@ class job2phonecall(osv.osv_memory):
         if id3:
             id3 = data_obj.browse(cr, uid, id3, context=context).res_id
 
-        for job in job_case_obj.browse(cr, uid, context['active_ids'], context=context):
+        for job in job_case_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             #TODO: Take other info from job
             new_phonecall_id = phonecall_case_obj.create(cr, uid, {
                         'name': job.name,
diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py
index e03b7f93b3b..65310cd59ac 100644
--- a/addons/hr_timesheet/hr_timesheet.py
+++ b/addons/hr_timesheet/hr_timesheet.py
@@ -70,8 +70,6 @@ class hr_analytic_timesheet(osv.osv):
     }
 
     def unlink(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         toremove = {}
         for obj in self.browse(cr, uid, ids, context=context):
             toremove[obj.line_id.id] = True
@@ -80,8 +78,6 @@ class hr_analytic_timesheet(osv.osv):
 
 
     def on_change_unit_amount(self, cr, uid, id, prod_id, unit_amount, company_id, unit=False, journal_id=False, context=None):
-        if context is None:
-            context = {}
         res = {'value':{}}
         if prod_id and unit_amount:
             # find company
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index a7db79b9102..c5cf5fcc02e 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-04 08:47+0000\n"
+"PO-Revision-Date: 2010-12-15 20:55+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #~ msgid "Error: UOS must be in a different category than the UOM"
@@ -144,6 +144,8 @@ msgstr "Travail effectué dans la dernière période"
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Erreur ! Vous ne pouvez pas sélectionner un département pour lequel "
+"l'employé est le responsable."
 
 #. module: hr_timesheet
 #: field:hr.sign.in.project,state:0
@@ -166,7 +168,7 @@ msgstr "Imprimer la feuille de temps de l'employé"
 #: code:addons/hr_timesheet/hr_timesheet.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Avertissement !"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py:0
@@ -196,7 +198,7 @@ msgstr "Compte analytique"
 #: code:addons/hr_timesheet/wizard/hr_timesheet_print_employee.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Avertissement"
 
 #. module: hr_timesheet
 #: model:ir.module.module,shortdesc:hr_timesheet.module_meta_information
@@ -269,7 +271,7 @@ msgstr "Date de début"
 #. module: hr_timesheet
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Catégories"
 
 #. module: hr_timesheet
 #: selection:hr.analytical.timesheet.employee,month:0
@@ -310,7 +312,7 @@ msgstr "Ligne d'horaire"
 #. module: hr_timesheet
 #: field:hr.analytical.timesheet.users,employee_ids:0
 msgid "employees"
-msgstr ""
+msgstr "employés"
 
 #. module: hr_timesheet
 #: view:account.analytic.account:0
@@ -372,7 +374,7 @@ msgstr ""
 #. module: hr_timesheet
 #: view:hr.sign.in.project:0
 msgid "(Keep empty for current time)"
-msgstr ""
+msgstr "(Garder vide pour la date courante)"
 
 #. module: hr_timesheet
 #: view:hr.employee:0
@@ -431,6 +433,7 @@ msgstr "Novembre"
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer de hiérarchie récursive d'employés."
 
 #. module: hr_timesheet
 #: field:hr.sign.out.project,date:0
@@ -686,7 +689,7 @@ msgstr "Année"
 #. module: hr_timesheet
 #: view:hr.analytic.timesheet:0
 msgid "Accounting"
-msgstr ""
+msgstr "Comptabilité"
 
 #. module: hr_timesheet
 #: field:hr.analytic.timesheet,partner_id:0
diff --git a/addons/hr_timesheet/i18n/hr_timesheet.pot b/addons/hr_timesheet/i18n/hr_timesheet.pot
index 277edda9343..f51baa13892 100644
--- a/addons/hr_timesheet/i18n/hr_timesheet.pot
+++ b/addons/hr_timesheet/i18n/hr_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:41+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:41+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:28+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:28+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_timesheet/i18n/pt.po b/addons/hr_timesheet/i18n/pt.po
index 9fc41b68243..ba87bd6d20e 100644
--- a/addons/hr_timesheet/i18n/pt.po
+++ b/addons/hr_timesheet/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-10-30 08:27+0000\n"
+"PO-Revision-Date: 2010-12-15 14:57+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
index 9d00cbe26cb..9775a8518ff 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee.py
@@ -37,8 +37,6 @@ class analytical_timesheet_employee(osv.osv_memory):
     def _get_user(self, cr, uid, context=None):
 
         emp_obj = self.pool.get('hr.employee')
-        if context is None:
-            context = {}
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         if not emp_id:
             raise osv.except_osv(_("Warning"), _("No employee defined for this user"))
@@ -51,8 +49,6 @@ class analytical_timesheet_employee(osv.osv_memory):
              }
 
     def print_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': [],
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
index 53d4427482f..865ccacb393 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users.py
@@ -39,8 +39,6 @@ class analytical_timesheet_employees(osv.osv_memory):
              }
 
     def print_report(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, context=context)[0]
         datas = {
              'ids': [],
diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
index cf1e10bce37..596076cf336 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
+++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out.py
@@ -40,16 +40,12 @@ class hr_so_project(osv.osv_memory):
 
     def _get_empid(self, cr, uid, context=None):
         emp_obj = self.pool.get('hr.employee')
-        if context is None:
-            context = {}
         emp_ids = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_ids:
             for employee in emp_obj.browse(cr, uid, emp_ids, context=context):
                 return {'name': employee.name, 'state': employee.state, 'emp_id': emp_ids[0], 'server_date':time.strftime('%Y-%m-%d %H:%M:%S')}
 
     def _get_empid2(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         res = self._get_empid(cr, uid, context=context)
         cr.execute('select name,action from hr_attendance where employee_id=%s order by name desc limit 1', (res['emp_id'],))
 
@@ -61,8 +57,6 @@ class hr_so_project(osv.osv_memory):
         return res
 
     def default_get(self, cr, uid, fields_list, context=None):
-        if context is None:
-            context = {}
         res = super(hr_so_project, self).default_get(cr, uid, fields_list, context=context)
         res.update(self._get_empid2(cr, uid, context=context))
         return res
@@ -94,8 +88,6 @@ class hr_so_project(osv.osv_memory):
         return timesheet_obj.create(cr, uid, res, context=context)
 
     def sign_out_result_end(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
@@ -104,8 +96,6 @@ class hr_so_project(osv.osv_memory):
         return {}
 
     def sign_out_result(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         emp_obj = self.pool.get('hr.employee')
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
@@ -137,8 +127,6 @@ class hr_si_project(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         """
         emp_obj = self.pool.get('hr.employee')
-        if context is None:
-            context = {}
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         if not emp_id:
             raise osv.except_osv(_('UserError'), _('No employee defined for your user !'))
@@ -146,8 +134,6 @@ class hr_si_project(osv.osv_memory):
 
     def check_state(self, cr, uid, ids, context=None):
         obj_model = self.pool.get('ir.model.data')
-        if context is None:
-            context = {}
         emp_id = self.default_get(cr, uid, context)['emp_id']
         # get the latest action (sign_in or out) for this employee
         cr.execute('select action from hr_attendance where employee_id=%s and action in (\'sign_in\',\'sign_out\') order by name desc limit 1', (emp_id,))
@@ -168,8 +154,6 @@ class hr_si_project(osv.osv_memory):
 
     def sign_in_result(self, cr, uid, ids, context=None):
         emp_obj = self.pool.get('hr.employee')
-        if context is None:
-            context = {}
         for data in self.browse(cr, uid, ids, context=context):
             emp_id = data.emp_id.id
             emp_obj.attendance_action_change(cr, uid, [emp_id], type = 'sign_in' ,dt=data.date or False)
@@ -177,8 +161,6 @@ class hr_si_project(osv.osv_memory):
 
     def default_get(self, cr, uid, fields_list, context=None):
         res = super(hr_si_project, self).default_get(cr, uid, fields_list, context=context)
-        if context is None:
-            context = {}
         emp_obj = self.pool.get('hr.employee')
         emp_id = emp_obj.search(cr, uid, [('user_id', '=', uid)], context=context)
         if emp_id:
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index 6d022a3c926..54d82ed2c79 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -41,8 +41,6 @@ hr_timesheet_invoice_factor()
 class account_analytic_account(osv.osv):
     def _invoiced_calc(self, cr, uid, ids, name, arg, context=None):
         obj_invoice = self.pool.get('account.invoice')
-        if context is None:
-            context = {}
         res = {}
 
         cr.execute('SELECT account_id as account_id, l.invoice_id '
@@ -90,14 +88,10 @@ class account_analytic_line(osv.osv):
     }
 
     def unlink(self, cursor, user, ids, context=None):
-        if context is None:
-            context = {}
         return super(account_analytic_line,self).unlink(cursor, user, ids,
                 context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
-        if context is None:
-            context = {}
         self._check_inv(cr, uid, ids, vals)
         return super(account_analytic_line,self).write(cr, uid, ids, vals,
                 context=context)
@@ -114,8 +108,6 @@ class account_analytic_line(osv.osv):
         return True
 
     def copy(self, cursor, user, obj_id, default=None, context=None):
-        if context is None:
-            context = {}
         if default is None:
             default = {}
         default = default.copy()
@@ -144,8 +136,6 @@ class hr_analytic_timesheet(osv.osv):
         return res
 
     def copy(self, cursor, user, obj_id, default=None, context=None):
-        if context is None:
-            context = {}
         if default is None:
             default = {}
         default = default.copy()
diff --git a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
index 562d66e4e6e..275892e5c38 100644
--- a/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
+++ b/addons/hr_timesheet_invoice/i18n/hr_timesheet_invoice.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:15:35+0000\n"
-"PO-Revision-Date: 2010-12-10 17:15:35+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:29+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -209,11 +209,6 @@ msgstr ""
 msgid "Group By..."
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: view:hr.timesheet.invoice.create:0
 #: view:hr.timesheet.invoice.create.final:0
@@ -549,11 +544,6 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#. module: hr_timesheet_invoice
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
-
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,amount_invoiced:0
 msgid "Total invoiced"
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
index 4630ea1e833..068119c44a1 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit.py
@@ -46,8 +46,6 @@ class account_analytic_profit(osv.osv_memory):
 
     def print_report(self, cr, uid, ids, context=None):
         line_obj = self.pool.get('account.analytic.line')
-        if context is None:
-            context = {}
         data = {}
         data['form'] = self.read(cr, uid , ids, [], context=context)[0]
         ids_chk = line_obj.search(cr, uid, [
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
index 04cdc7231e5..e3ddd4fed6a 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py
@@ -116,8 +116,6 @@ class hr_timesheet_sheet(osv.osv):
 
     def _total_day(self, cr, uid, ids, name, args, context=None):
         res = {}
-        if context is None:
-            context = {}
         cr.execute('SELECT sheet.id, day.total_attendance, day.total_timesheet, day.total_difference\
                 FROM hr_timesheet_sheet_sheet AS sheet \
                 LEFT JOIN hr_timesheet_sheet_sheet_day AS day \
@@ -133,8 +131,6 @@ class hr_timesheet_sheet(osv.osv):
 
     def _total(self, cr, uid, ids, name, args, context=None):
         res = {}
-        if context is None:
-            context = {}
         cr.execute('SELECT s.id, COALESCE(SUM(d.total_attendance),0), COALESCE(SUM(d.total_timesheet),0), COALESCE(SUM(d.total_difference),0) \
                 FROM hr_timesheet_sheet_sheet s \
                     LEFT JOIN hr_timesheet_sheet_sheet_day d \
@@ -152,8 +148,6 @@ class hr_timesheet_sheet(osv.osv):
         result = {}
         link_emp = {}
         emp_ids = []
-        if context is None:
-            context = {}
 
         for sheet in self.browse(cr, uid, ids, context=context):
             result[sheet.id] = 'none'
@@ -195,8 +189,6 @@ class hr_timesheet_sheet(osv.osv):
         return super(hr_timesheet_sheet, self).write(cr, uid, ids, vals, *args, **argv)
 
     def button_confirm(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
             self.check_employee_attendance_state(cr, uid, sheet.id, context)
             di = sheet.user_id.company_id.timesheet_max_difference
@@ -208,8 +200,6 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def date_today(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
             if datetime.today() <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
@@ -220,8 +210,6 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def date_previous(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
             if datetime.strptime(sheet.date_current, '%Y-%m-%d') <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
@@ -232,8 +220,6 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def date_next(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
             if datetime.strptime(sheet.date_current, '%Y-%m-%d') >= datetime.strptime(sheet.date_to, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
@@ -244,8 +230,6 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def button_dummy(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
             if datetime.strptime(sheet.date_current, '%Y-%m-%d') <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
@@ -312,8 +296,6 @@ class hr_timesheet_sheet(osv.osv):
     }
 
     def _default_date_from(self,cr, uid, context=None):
-        if context is None:
-            context = {}
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         r = user.company_id and user.company_id.timesheet_range or 'month'
         if r=='month':
@@ -348,8 +330,8 @@ class hr_timesheet_sheet(osv.osv):
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr_timesheet_sheet.sheet', context=c)
     }
 
-    def _sheet_date(self, cr, uid, ids, forced_user_id=False):
-        for sheet in self.browse(cr, uid, ids):
+    def _sheet_date(self, cr, uid, ids, forced_user_id=False, context=None):
+        for sheet in self.browse(cr, uid, ids, context=context):
             new_user_id = forced_user_id or sheet.user_id and sheet.user_id.id
             if new_user_id:
                 cr.execute('SELECT id \
@@ -361,8 +343,8 @@ class hr_timesheet_sheet(osv.osv):
                     return False
         return True
 
-    def _date_current_check(self, cr, uid, ids):
-        for sheet in self.browse(cr, uid, ids):
+    def _date_current_check(self, cr, uid, ids, context=None):
+        for sheet in self.browse(cr, uid, ids, context=context):
             if sheet.date_current < sheet.date_from or sheet.date_current > sheet.date_to:
                 return False
         return True
@@ -381,8 +363,6 @@ class hr_timesheet_sheet(osv.osv):
         return True
 
     def name_get(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         if not len(ids):
             return []
         return [(r['id'], r['date_from'] + ' - ' + r['date_to']) \
@@ -390,8 +370,6 @@ class hr_timesheet_sheet(osv.osv):
                     context=context, load='_classic_write')]
 
     def unlink(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         sheets = self.read(cr, uid, ids, ['state','total_attendance'], context=context)
         for sheet in sheets:
             if sheet['state'] in ('confirm', 'done'):
@@ -415,8 +393,6 @@ class hr_timesheet_line(osv.osv):
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
-        if context is None:
-            context = {}
         cursor.execute('SELECT l.id, COALESCE(MAX(s.id), 0) \
                 FROM hr_timesheet_sheet_sheet s \
                     LEFT JOIN (hr_analytic_timesheet l \
@@ -441,8 +417,6 @@ class hr_timesheet_line(osv.osv):
         return res
 
     def _sheet_search(self, cursor, user, obj, name, args, context=None):
-        if context is None:
-            context = {}
         if not len(args):
             return []
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
@@ -537,8 +511,6 @@ class hr_attendance(osv.osv):
         return time.strftime('%Y-%m-%d %H:%M:%S')
 
     def _sheet(self, cursor, user, ids, name, args, context=None):
-        if context is None:
-            context = {}
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
         cursor.execute("SELECT a.id, COALESCE(MAX(s.id), 0) \
                 FROM hr_timesheet_sheet_sheet s \
@@ -569,8 +541,6 @@ class hr_attendance(osv.osv):
             return []
 
         sheet_obj = self.pool.get('hr_timesheet_sheet.sheet')
-        if context is None:
-            context = {}
         i = 0
         while i < len(args):
             fargs = args[i][0].split('.', 1)
diff --git a/addons/hr_timesheet_sheet/i18n/cs.po b/addons/hr_timesheet_sheet/i18n/cs.po
index 80867ad4ebb..e075e7119a1 100644
--- a/addons/hr_timesheet_sheet/i18n/cs.po
+++ b/addons/hr_timesheet_sheet/i18n/cs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-03 06:27+0000\n"
+"PO-Revision-Date: 2010-12-16 00:04+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/et.po b/addons/hr_timesheet_sheet/i18n/et.po
index a101093875e..7fbd4a6f0ad 100644
--- a/addons/hr_timesheet_sheet/i18n/et.po
+++ b/addons/hr_timesheet_sheet/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2009-11-09 17:45+0000\n"
+"PO-Revision-Date: 2010-12-16 03:29+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
index a861cfa41c3..12a9aff9faf 100644
--- a/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
+++ b/addons/hr_timesheet_sheet/i18n/hr_timesheet_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:43+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:43+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:30+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/hr_timesheet_sheet/i18n/sl.po b/addons/hr_timesheet_sheet/i18n/sl.po
index f913ee84000..13bfa17de8d 100644
--- a/addons/hr_timesheet_sheet/i18n/sl.po
+++ b/addons/hr_timesheet_sheet/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-08-03 06:31+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-16 02:35+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index 6ec2dd5b1e8..5a8fa2c59b3 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -48,7 +48,7 @@ class hr_timesheet_current_open(osv.osv_memory):
             domain = "[('user_id', '=', uid)]"
         value = {
             'domain': domain,
-            'name': 'Open Timesheet',
+            'name': _('Open Timesheet'),
             'view_type': 'form',
             'view_mode': view_type,
             'res_model': 'hr_timesheet_sheet.sheet',
diff --git a/addons/html_view/i18n/html_view.pot b/addons/html_view/i18n/html_view.pot
index 71cd7bfa0b9..e56b0dc010a 100644
--- a/addons/html_view/i18n/html_view.pot
+++ b/addons/html_view/i18n/html_view.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:44+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:44+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:30+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/html_view/i18n/nb.po b/addons/html_view/i18n/nb.po
index 1f49ca6f565..2aa7c1ceaf2 100644
--- a/addons/html_view/i18n/nb.po
+++ b/addons/html_view/i18n/nb.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-13 05:44+0000\n"
-"Last-Translator: André Jordan <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 13:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: html_view
diff --git a/addons/idea/i18n/fr.po b/addons/idea/i18n/fr.po
index 934164d3571..e6e1363058b 100644
--- a/addons/idea/i18n/fr.po
+++ b/addons/idea/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
diff --git a/addons/idea/i18n/idea.pot b/addons/idea/i18n/idea.pot
index c9ec2849092..a4bfb6c0f63 100644
--- a/addons/idea/i18n/idea.pot
+++ b/addons/idea/i18n/idea.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:45+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:45+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:31+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/idea/i18n/sv.po b/addons/idea/i18n/sv.po
index 62e479deb43..5bb79b99a93 100644
--- a/addons/idea/i18n/sv.po
+++ b/addons/idea/i18n/sv.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-12 22:42+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 20:13+0000\n"
+"Last-Translator: Magnus Brandt (mba), Aspirix AB <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
-msgstr ""
+msgstr "Om \"Sant\" kommer skaparen av denna idé att vara synlig för andra"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Välj idé"
 
 #. module: idea
 #: view:idea.idea:0
@@ -42,7 +42,7 @@ msgstr "Kommentarer"
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr ""
+msgstr "Skicka röst"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
@@ -88,12 +88,12 @@ msgstr "Neka"
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr ""
+msgstr "Räknare av röster"
 
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "Idé röster statistik"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -101,12 +101,12 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr ""
+msgstr "Dålig"
 
 #. module: idea
 #: selection:report.vote,idea_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Avbruten"
 
 #. module: idea
 #: view:idea.category:0
@@ -118,17 +118,17 @@ msgstr ""
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Varning !"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr ""
+msgstr "Din kommentar"
 
 #. module: idea
 #: view:report.vote:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Månad   "
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
@@ -146,7 +146,7 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr ""
+msgstr "Väldigt dålig"
 
 #. module: idea
 #: view:idea.vote:0
@@ -178,13 +178,13 @@ msgstr ""
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Idé kategori"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,stat_vote_ids:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistik"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -202,7 +202,7 @@ msgstr ""
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "välj idé"
 
 #. module: idea
 #: view:idea.stat:0
@@ -212,12 +212,12 @@ msgstr ""
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Underkategori"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "Nästa"
 
 #. module: idea
 #: view:idea.idea:0
@@ -225,7 +225,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -233,7 +233,7 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Good"
-msgstr ""
+msgstr "Bra"
 
 #. module: idea
 #: help:idea.idea,open_date:0
@@ -243,7 +243,7 @@ msgstr ""
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "Idé detaljer"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -257,12 +257,12 @@ msgstr ""
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "Öppna idé"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: idea
 #: view:idea.idea:0
@@ -270,7 +270,7 @@ msgstr ""
 #: view:report.vote:0
 #: selection:report.vote,idea_state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Accepterad"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
@@ -286,24 +286,24 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Öppnad datum"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
 #: model:ir.actions.act_window,name:idea.action_idea_post_vote
 msgid "Vote"
-msgstr ""
+msgstr "Rösta"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr ""
+msgstr "Röststatistik"
 
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Maximalt antal röster per användare"
 
 #. module: idea
 #: view:idea.category:0
@@ -317,29 +317,29 @@ msgstr ""
 #: field:idea.vote,comment:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "Månad"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 msgid "Open Ideas"
-msgstr ""
+msgstr "Öppna idéer"
 
 #. module: idea
 #: view:idea.category:0
@@ -349,7 +349,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Kategori"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -357,18 +357,18 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr ""
+msgstr "Mycket bra"
 
 #. module: idea
 #: view:report.vote:0
 msgid "  Year  "
-msgstr ""
+msgstr "  År  "
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: selection:report.vote,idea_state:0
 msgid "Opened"
-msgstr ""
+msgstr "Öppnad"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
@@ -378,7 +378,7 @@ msgstr ""
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr ""
+msgstr "Ny idé"
 
 #. module: idea
 #: view:idea.vote.stat:0
@@ -395,12 +395,12 @@ msgstr ""
 #: selection:idea.idea,state:0
 #: selection:report.vote,idea_state:0
 msgid "Draft"
-msgstr ""
+msgstr "Utkast"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "Augusti"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -408,18 +408,18 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Användarnamn"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
@@ -432,12 +432,12 @@ msgstr ""
 #: field:idea.vote,user_id:0
 #: view:report.vote:0
 msgid "User"
-msgstr ""
+msgstr "Användare"
 
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -447,33 +447,33 @@ msgstr ""
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr ""
+msgstr "Min röst"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,created_date:0
 msgid "Creation date"
-msgstr ""
+msgstr "Skapad datum"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
 msgid "idea.idea"
-msgstr ""
+msgstr "idea.idea"
 
 #. module: idea
 #: field:idea.category,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Summering"
 
 #. module: idea
 #: field:idea.idea,name:0
@@ -483,12 +483,12 @@ msgstr ""
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "History"
-msgstr ""
+msgstr "Historik"
 
 #. module: idea
 #: view:idea.idea:0
@@ -498,20 +498,20 @@ msgstr ""
 #. module: idea
 #: field:report.vote,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Orderdatum"
 
 #. module: idea
 #: view:idea.idea:0
 #: field:idea.idea,user_id:0
 #: view:report.vote:0
 msgid "Creator"
-msgstr ""
+msgstr "Skapare"
 
 #. module: idea
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Ge röst"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
@@ -521,18 +521,18 @@ msgstr ""
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Cancel"
-msgstr ""
+msgstr "Avbryt"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Close"
-msgstr ""
+msgstr "Stäng"
 
 #. module: idea
 #: view:idea.idea:0
 #: view:report.vote:0
 msgid "Open"
-msgstr ""
+msgstr "öppna"
 
 #. module: idea
 #: view:report.vote:0
@@ -546,7 +546,7 @@ msgstr ""
 #: model:ir.ui.menu,name:idea.menu_ideas
 #: model:ir.ui.menu,name:idea.menu_ideas1
 msgid "Ideas"
-msgstr ""
+msgstr "Idéer"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
@@ -556,7 +556,7 @@ msgstr ""
 #. module: idea
 #: view:idea.idea:0
 msgid "Current"
-msgstr ""
+msgstr "Nuvarande"
 
 #. module: idea
 #: field:idea.vote.stat,score:0
@@ -567,25 +567,25 @@ msgstr ""
 #. module: idea
 #: view:idea.vote:0
 msgid "Comments:"
-msgstr ""
+msgstr "Kommentarer:"
 
 #. module: idea
 #: view:idea.category:0
 #: field:idea.idea,description:0
 #: field:idea.post.vote,note:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivning"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: view:report.vote:0
 msgid "Refused"
-msgstr ""
+msgstr "Nekad"
 
 #. module: idea
 #: code:addons/idea/idea.py:0
@@ -601,12 +601,12 @@ msgstr ""
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Idag    "
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
@@ -616,7 +616,7 @@ msgstr ""
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
@@ -643,12 +643,12 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_id:0
 msgid "Idea"
-msgstr ""
+msgstr "Idé"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "Acceptera"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
@@ -659,7 +659,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: idea
 #: view:idea.select:0
diff --git a/addons/idea/idea.py b/addons/idea/idea.py
index b7b7840a3f5..deda3ab1350 100644
--- a/addons/idea/idea.py
+++ b/addons/idea/idea.py
@@ -53,7 +53,7 @@ class idea_idea(osv.osv):
     _name = 'idea.idea'
     _rec_name = 'name'
 
-    def _vote_avg_compute(self, cr, uid, ids, name, arg, context = None):
+    def _vote_avg_compute(self, cr, uid, ids, name, arg, context=None):
 
         """ compute average for voting
          @param cr: the current row, from the database cursor,
@@ -113,7 +113,7 @@ class idea_idea(osv.osv):
         cr.execute(sql, (tuple(ids),))
         return dict(cr.fetchall())
 
-    def _vote_read(self, cr, uid, ids, name, arg, context = None):
+    def _vote_read(self, cr, uid, ids, name, arg, context=None):
 
         """ Read Vote
         @param cr: the current row, from the database cursor,
@@ -125,13 +125,13 @@ class idea_idea(osv.osv):
             res[id] = '-1'
         vote_obj = self.pool.get('idea.vote')
         votes_ids = vote_obj.search(cr, uid, [('idea_id', 'in', ids), ('user_id', '=', uid)])
-        vote_obj_id = vote_obj.browse(cr, uid, votes_ids, context)
+        vote_obj_id = vote_obj.browse(cr, uid, votes_ids, context=context)
 
         for vote in vote_obj_id:
             res[vote.idea_id.id] = vote.score
         return res
 
-    def _vote_save(self, cr, uid, id, field_name, field_value, arg, context = None):
+    def _vote_save(self, cr, uid, id, field_name, field_value, arg, context=None):
 
         """ save Vote
         @param cr: the current row, from the database cursor,
@@ -189,7 +189,7 @@ class idea_idea(osv.osv):
     }
     _order = 'id desc'
 
-    def create(self, cr, user, vals, context={}):
+    def create(self, cr, user, vals, context=None):
         """
         Create a new record for a model idea_idea
         @param cr: A database cursor
@@ -203,17 +203,17 @@ class idea_idea(osv.osv):
 
         if vals.get('category_id', False):
             category_pool = self.pool.get('idea.category')
-            category = category_pool.browse(cr, user, vals.get('category_id'), context)
+            category = category_pool.browse(cr, user, vals.get('category_id'), context=context)
             visibility = category.visibility
 
         vals.update({
             'visibility':visibility
         })
 
-        res_id = super(idea_idea, self).create(cr, user, vals, context)
+        res_id = super(idea_idea, self).create(cr, user, vals, context=context)
         return res_id
 
-    def copy(self, cr, uid, id, default={}, context={}):
+    def copy(self, cr, uid, id, default={}, context=None):
         """
         Create the new record in idea_idea model from existing one
         @param cr: A database cursor
@@ -231,7 +231,7 @@ class idea_idea(osv.osv):
             'stat_vote_ids':False
 
         })
-        res_id = super(idea_idea, self).copy(cr, uid, id, default, context)
+        res_id = super(idea_idea, self).copy(cr, uid, id, default, context=context)
         return res_id
 
     def write(self, cr, user, ids, vals, context=None):
@@ -246,14 +246,13 @@ class idea_idea(osv.osv):
 
         @return: Returns True on success, False otherwise
         """
-
-        state = self.browse(cr, user, ids[0]).state
+        state = self.browse(cr, user, ids[0], context=context).state
 
         if vals.get('my_vote', False):
             if vals.get('state', state) != 'open':
                 raise osv.except_osv(_("Warning !"), _("Draft/Accepted/Cancelled ideas Could not be voted"))
 
-        res = super(idea_idea, self).write(cr, user, ids, vals, context)
+        res = super(idea_idea, self).write(cr, user, ids, vals, context=context)
         return res
 
     def idea_cancel(self, cr, uid, ids):
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index 7dacbcfedac..712f84d4053 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -39,7 +39,7 @@ class idea_post_vote(osv.osv_memory):
         'note': fields.text('Description'),
     }
 
-    def get_default(self, cr, uid, context={}):
+    def get_default(self, cr, uid, context=None):
         """
         This function checks for precondition before wizard executes
         @param self: The object pointer
@@ -48,10 +48,12 @@ class idea_post_vote(osv.osv_memory):
         @param fields: List of fields for default value
         @param context: A standard dictionary for contextual values
         """
+        if context is None:
+            context = {}
         idea_obj = self.pool.get('idea.idea')
 
         if context.get('active_id'):
-            idea = idea_obj.browse(cr, uid, context.get('active_id'))
+            idea = idea_obj.browse(cr, uid, context.get('active_id'), context=context)
             return idea.my_vote
         else:
             return 75
@@ -72,7 +74,7 @@ class idea_post_vote(osv.osv_memory):
         idea_obj = self.pool.get('idea.idea')
         vote_obj = self.pool.get('idea.vote')
 
-        for idea in idea_obj.browse(cr, uid, context.get('active_ids', [])):
+        for idea in idea_obj.browse(cr, uid, context.get('active_ids', []), context=context):
 
             for active_id in context.get('active_ids'):
 
@@ -106,7 +108,7 @@ class idea_post_vote(osv.osv_memory):
         idea_pool = self.pool.get('idea.idea')
         comment_pool = self.pool.get('idea.comment')
 
-        for do_vote_obj in self.read(cr, uid, ids):
+        for do_vote_obj in self.read(cr, uid, ids, context=context):
             score = str(do_vote_obj['vote'])
             comment = do_vote_obj.get('note', False)
             vote = {
@@ -147,7 +149,9 @@ class idea_select(osv.osv_memory):
        @param ids: List of load column,
        @return: dictionary of query logs clear message window
        """
-       idea_obj = self.browse(cr, uid, ids)
+       if context is None:
+            context = {}
+       idea_obj = self.browse(cr, uid, ids, context=context)
        for idea in idea_obj:
            idea_id = idea.idea_id.id
 
diff --git a/addons/knowledge/i18n/knowledge.pot b/addons/knowledge/i18n/knowledge.pot
index 3f73b16b9a6..f7cc7167570 100644
--- a/addons/knowledge/i18n/knowledge.pot
+++ b/addons/knowledge/i18n/knowledge.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:45+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:45+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:31+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,8 +16,33 @@ msgstr ""
 "Plural-Forms: \n"
 
 #. module: knowledge
-#: help:knowledge.installer,wiki_faq:0
-msgid "Creates a skeleton internal FAQ pre-filled with documentation about OpenERP's Document Management System."
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr ""
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Share information within the company with these specific Addons."
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
 msgstr ""
 
 #. module: knowledge
@@ -31,38 +56,13 @@ msgid "Provides a WebDAV access to your OpenERP's Document Management System. Le
 msgstr ""
 
 #. module: knowledge
-#: field:knowledge.installer,wiki:0
-msgid "Collaborative Content (Wiki)"
+#: view:knowledge.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: knowledge
-#: help:knowledge.installer,wiki_quality_manual:0
-msgid "Creates an example skeleton for a standard quality manual."
-msgstr ""
-
-#. module: knowledge
-#: field:knowledge.installer,wiki_quality_manual:0
-msgid "Quality Manual"
-msgstr ""
-
-#. module: knowledge
-#: field:knowledge.installer,config_logo:0
-msgid "Image"
-msgstr ""
-
-#. module: knowledge
-#: field:knowledge.installer,wiki_faq:0
-msgid "Internal FAQ"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
-msgid "Knowledge Application Configuration"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.module.module,shortdesc:knowledge.module_meta_information
-msgid "Knowledge Management System"
+#: view:knowledge.installer:0
+msgid "title"
 msgstr ""
 
 #. module: knowledge
@@ -72,8 +72,13 @@ msgid "Installer for knowledge-based tools\n"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_installer
-msgid "knowledge.installer"
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
 msgstr ""
 
 #. module: knowledge
@@ -81,29 +86,40 @@ msgstr ""
 msgid "Shared Repositories (WebDAV)"
 msgstr ""
 
-#. module: knowledge
-#: field:knowledge.installer,document_ftp:0
-msgid "Shared Repositories (FTP)"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
-msgid "Knowledge"
-msgstr ""
-
 #. module: knowledge
 #: field:knowledge.installer,progress:0
 msgid "Configuration Progress"
 msgstr ""
 
 #. module: knowledge
-#: view:knowledge.installer:0
-msgid "title"
+#: help:knowledge.installer,wiki_faq:0
+msgid "Creates a skeleton internal FAQ pre-filled with documentation about OpenERP's Document Management System."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document_configuration
-msgid "Configuration"
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr ""
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+#: view:knowledge.installer:0
+msgid "Knowledge Application Configuration"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr ""
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Configure Your Knowledge Application"
 msgstr ""
 
 #. module: knowledge
diff --git a/addons/l10n_be/i18n/l10n_be.pot b/addons/l10n_be/i18n/l10n_be.pot
index aeb40ec8511..14c131362fa 100644
--- a/addons/l10n_be/i18n/l10n_be.pot
+++ b/addons/l10n_be/i18n/l10n_be.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:46+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:32+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:32+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
index 6776f9c42e1..dcb9b01afe0 100644
--- a/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
+++ b/addons/l10n_be/wizard/l10_be_partner_vat_listing.py
@@ -33,7 +33,7 @@ class vat_listing_clients(osv.osv_memory):
         'amount': fields.float('Amount'),
         'turnover': fields.float('Turnover'),
             }
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
         return [(r['id'], r['name'] or '' + ' - ' + r['vat'] or '') \
@@ -52,7 +52,7 @@ class partner_vat(osv.osv_memory):
     """ Vat Listing """
     _name = "partner.vat"
 
-    def get_partner(self, cursor, user, ids, context={}):
+    def get_partner(self, cursor, user, ids, context=None):
         obj_period = self.pool.get('account.period')
         obj_partner = self.pool.get('res.partner')
         obj_vat_lclient = self.pool.get('vat.listing.clients')
@@ -131,14 +131,14 @@ class partner_vat_list(osv.osv_memory):
         'file_save' : fields.binary('Save File', readonly=True),
         }
 
-    def _get_partners(self, cursor, user, context={}):
+    def _get_partners(self, cursor, user, context=None):
         return context.get('partner_ids', [])
 
     _defaults={
         'partner_ids': _get_partners
             }
 
-    def create_xml(self, cursor, user, ids, context={}):
+    def create_xml(self, cursor, user, ids, context=None):
         datas = []
         obj_sequence = self.pool.get('ir.sequence')
         obj_users = self.pool.get('res.users')
diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py
index 2bea9ba35b7..0fa14de41c7 100644
--- a/addons/l10n_ch/invoice.py
+++ b/addons/l10n_ch/invoice.py
@@ -96,13 +96,13 @@ class account_invoice(osv.osv):
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @return a boolean True if valid False if invalid
-    def _check_bvr(self, cr, uid, ids):
+    def _check_bvr(self, cr, uid, ids, context=None):
         """
         Function to validate a bvr reference like :
         0100054150009>132000000000000000000000014+ 1300132412>
         The validation is based on l10n_ch
         """
-        invoices = self.browse(cr,uid,ids)
+        invoices = self.browse(cr,uid,ids, context=context)
         for invoice in invoices:
             if invoice.reference_type == 'bvr':
                 if not invoice.reference:
@@ -123,10 +123,10 @@ class account_invoice(osv.osv):
     ## @param user res.user.id that is currently loged
     ## @parma ids invoices id
     ## @return a boolean True if valid False if invalid
-    def _check_reference_type(self, cursor, user, ids):
+    def _check_reference_type(self, cursor, user, ids, context=None):
         """Check the customer invoice reference type depending
         on the BVR reference type and the invoice partner bank type"""
-        for invoice in self.browse(cursor, user, ids):
+        for invoice in self.browse(cursor, user, ids, context=context):
             if invoice.type in 'in_invoice':
                 if invoice.partner_bank_id and \
                         invoice.partner_bank_id.state in \
diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py
index 6d05cabd8e7..489739798ec 100644
--- a/addons/l10n_ch/wizard/create_dta.py
+++ b/addons/l10n_ch/wizard/create_dta.py
@@ -581,7 +581,7 @@ class create_dta_wizard(osv.osv_memory):
         'dta_file':fields.binary('DTA File', readonly=True)
     }
     def create_dta(self, cr, uid, ids, context=None):
-        if not context:
+        if context is None:
             context = {}
         data = {}
         active_ids = context.get('active_ids', [])
diff --git a/addons/l10n_de/i18n/l10n_de.pot b/addons/l10n_de/i18n/l10n_de.pot
index e2c8068bc59..2a93835a012 100644
--- a/addons/l10n_de/i18n/l10n_de.pot
+++ b/addons/l10n_de/i18n/l10n_de.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:50+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:50+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:38+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_es/i18n/l10n_es.pot b/addons/l10n_es/i18n/l10n_es.pot
index c186478fb28..aa5087b216d 100644
--- a/addons/l10n_es/i18n/l10n_es.pot
+++ b/addons/l10n_es/i18n/l10n_es.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:53+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:53+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:41+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:41+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_fr/i18n/es.po b/addons/l10n_fr/i18n/es.po
index 2be5d97c47a..d7479cc19dc 100644
--- a/addons/l10n_fr/i18n/es.po
+++ b/addons/l10n_fr/i18n/es.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-10-28 09:07+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-12-15 22:44+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
@@ -33,17 +33,20 @@ msgid ""
 "\n"
 "Credits: Sistheo Zeekom CrysaLEAD\n"
 msgstr ""
+"Este es el módulo para gestionar el plan contable francés en OpenERP.\n"
+"\n"
+"Créditos: Sistheo Zeekom CrysaLEAD\n"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_immobilisations
 msgid "Immobilisations"
-msgstr ""
+msgstr "Inmobilizaciones"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_5
 msgid "France"
-msgstr ""
+msgstr "Francia"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_asset
@@ -59,17 +62,17 @@ msgstr "Patrimonio"
 #: view:account.bilan.report:0
 #: view:account.cdr.report:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimir"
 
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_report
 msgid "Report for l10n_fr"
-msgstr ""
+msgstr "Informe para l10n_fr"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_2
 msgid "Zone Euro"
-msgstr ""
+msgstr "Zona Euro"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_expense
@@ -79,12 +82,12 @@ msgstr "Gasto"
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_account_cdr_report
 msgid "Account CDR Report"
-msgstr ""
+msgstr "Informe cuenta CDR"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_provision
 msgid "Provisions"
-msgstr ""
+msgstr "Provisiones"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_payable
@@ -94,12 +97,12 @@ msgstr "A pagar"
 #. module: l10n_fr
 #: view:account.cdr.report:0
 msgid "Compte de resultant"
-msgstr ""
+msgstr "Cuenta de resultado"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,report_id:0
 msgid "Report"
-msgstr ""
+msgstr "Informe"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
@@ -114,38 +117,38 @@ msgstr ""
 #. module: l10n_fr
 #: model:ir.model,name:l10n_fr.model_l10n_fr_line
 msgid "Report Lines for l10n_fr"
-msgstr ""
+msgstr "Líneas informe para l10n_fr"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_7
 msgid "TVA sur les encaissements"
-msgstr ""
+msgstr "IVA sobre cobros"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,definition:0
 msgid "Definition"
-msgstr ""
+msgstr "Definición"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,name:0
 #: field:l10n.fr.report,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #. module: l10n_fr
 #: model:ir.actions.act_window,name:l10n_fr.action_account_cdr_report
 msgid "Compte de resultat Report"
-msgstr ""
+msgstr "Informe de cuenta de resultados"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stock
 msgid "Stocks"
-msgstr ""
+msgstr "Stocks"
 
 #. module: l10n_fr
 #: field:l10n.fr.report,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Líneas"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_cash
@@ -155,28 +158,28 @@ msgstr "Efectivo"
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_special
 msgid "Comptes spéciaux"
-msgstr ""
+msgstr "Cuentas especiales"
 
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.report:0
 msgid "The code report must be unique !"
-msgstr ""
+msgstr "El código del informe debe ser único"
 
 #. module: l10n_fr
 #: field:account.bilan.report,fiscalyear_id:0
 #: field:account.cdr.report,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Ejercicio fiscal"
 
 #. module: l10n_fr
 #: field:l10n.fr.report,code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_dettes
 msgid "Dettes long terme"
-msgstr ""
+msgstr "Deudas a largo plazo"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_view
@@ -186,28 +189,28 @@ msgstr "Vista"
 #. module: l10n_fr
 #: sql_constraint:l10n.fr.line:0
 msgid "The variable name must be unique !"
-msgstr ""
+msgstr "¡El nombre de la variable debe ser único!"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stocks
 msgid "Actif circulant"
-msgstr ""
+msgstr "Activo circulante"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_6
 msgid "TVA sur le débits"
-msgstr ""
+msgstr "IVA sobre los débitos"
 
 #. module: l10n_fr
 #: view:account.bilan.report:0
 #: model:ir.actions.act_window,name:l10n_fr.action_account_bilan_report
 msgid "Bilan Report"
-msgstr ""
+msgstr "Informe balance"
 
 #. module: l10n_fr
 #: model:ir.module.module,shortdesc:l10n_fr.module_meta_information
 msgid "France - Plan Comptable Général"
-msgstr ""
+msgstr "Francia - Plan contable general"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_tax
@@ -217,7 +220,7 @@ msgstr "Impuesto"
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
 msgid "DOM-TOM"
-msgstr ""
+msgstr "DOM-TOM"
 
 #. module: l10n_fr
 #: view:account.bilan.report:0
@@ -233,7 +236,7 @@ msgstr "Cierre"
 #. module: l10n_fr
 #: field:l10n.fr.line,code:0
 msgid "Variable Name"
-msgstr ""
+msgstr "Nombre variable"
 
 #~ msgid "Fiscal year"
 #~ msgstr "Año Fiscal"
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index d017524c2d9..e47503d1841 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:43+0000\n"
-"PO-Revision-Date: 2010-12-14 15:22+0000\n"
+"PO-Revision-Date: 2010-12-15 09:39+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
diff --git a/addons/l10n_fr/i18n/l10n_fr.pot b/addons/l10n_fr/i18n/l10n_fr.pot
index 3e4b6a4460e..5abf5d0bda2 100644
--- a/addons/l10n_fr/i18n/l10n_fr.pot
+++ b/addons/l10n_fr/i18n/l10n_fr.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:54+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:54+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:42+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:42+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_gr/i18n/l10n_gr.pot b/addons/l10n_gr/i18n/l10n_gr.pot
index 5c30f22a2d9..cd8d8d5fb1c 100644
--- a/addons/l10n_gr/i18n/l10n_gr.pot
+++ b/addons/l10n_gr/i18n/l10n_gr.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:55+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:55+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:43+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:43+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_gt/i18n/l10n_gt.pot b/addons/l10n_gt/i18n/l10n_gt.pot
index 856c76da319..0c5fe5f24e5 100644
--- a/addons/l10n_gt/i18n/l10n_gt.pot
+++ b/addons/l10n_gt/i18n/l10n_gt.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:55+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:55+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:44+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_in/i18n/l10n_in.pot b/addons/l10n_in/i18n/l10n_in.pot
index 95e0699efd4..b061dd58922 100644
--- a/addons/l10n_in/i18n/l10n_in.pot
+++ b/addons/l10n_in/i18n/l10n_in.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:56+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:56+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:44+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:44+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_lu/i18n/l10n_lu.pot b/addons/l10n_lu/i18n/l10n_lu.pot
index cb78633cb09..45a35294044 100644
--- a/addons/l10n_lu/i18n/l10n_lu.pot
+++ b/addons/l10n_lu/i18n/l10n_lu.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:57+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:57+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:46+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_ma/i18n/l10n_ma.pot b/addons/l10n_ma/i18n/l10n_ma.pot
index e65d729788e..f1ee14babd2 100644
--- a/addons/l10n_ma/i18n/l10n_ma.pot
+++ b/addons/l10n_ma/i18n/l10n_ma.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:43:58+0000\n"
-"PO-Revision-Date: 2010-12-03 15:43:58+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:46+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:46+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/l10n_uk/i18n/l10n_uk.pot b/addons/l10n_uk/i18n/l10n_uk.pot
index 2903e9cced6..85b09c8dd4f 100644
--- a/addons/l10n_uk/i18n/l10n_uk.pot
+++ b/addons/l10n_uk/i18n/l10n_uk.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:00+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:00+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:49+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:49+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/lunch/i18n/lunch.pot b/addons/lunch/i18n/lunch.pot
index eff8fd12ebd..a209e91427c 100644
--- a/addons/lunch/i18n/lunch.pot
+++ b/addons/lunch/i18n/lunch.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:01+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:01+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:50+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:50+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/lunch/i18n/pt.po b/addons/lunch/i18n/pt.po
index b0dbad92228..584f178799d 100644
--- a/addons/lunch/i18n/pt.po
+++ b/addons/lunch/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:37+0000\n"
+"PO-Revision-Date: 2010-12-15 08:50+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: lunch
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 5a777564408..1499dd4414e 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -64,7 +64,7 @@ class lunch_cashbox(osv.osv):
     _description = "Cashbox for Lunch "
 
 
-    def amount_available(self, cr, uid, ids, field_name, arg, context):
+    def amount_available(self, cr, uid, ids, field_name, arg, context=None):
 
         """ count available amount
         @param cr: the current row, from the database cursor,
@@ -125,7 +125,7 @@ class lunch_order(osv.osv):
          @param context: A standard dictionary for contextual values """
 
         res = {}
-        for price in self.browse(cr, uid, ids):
+        for price in self.browse(cr, uid, ids, context=context):
             res[price.id] = price.product.price
         return res
 
@@ -150,7 +150,7 @@ class lunch_order(osv.osv):
         'state': lambda self, cr, uid, context: 'draft',
     }
 
-    def confirm(self, cr, uid, ids, box, context):
+    def confirm(self, cr, uid, ids, box, context=None):
 
         """ confirm order
         @param cr: the current row, from the database cursor,
@@ -159,7 +159,7 @@ class lunch_order(osv.osv):
         @param context: A standard dictionary for contextual values """
 
         cashmove_ref = self.pool.get('lunch.cashmove')
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             if order.state == 'confirmed':
                 continue
             new_id = cashmove_ref.create(cr, uid, {'name': order.product.name+' order',
@@ -171,7 +171,7 @@ class lunch_order(osv.osv):
             self.write(cr, uid, [order.id], {'cashmove': new_id, 'state': 'confirmed'})
         return {}
 
-    def lunch_order_cancel(self, cr, uid, ids, context):
+    def lunch_order_cancel(self, cr, uid, ids, context=None):
 
         """" cancel order
          @param cr: the current row, from the database cursor,
@@ -179,7 +179,7 @@ class lunch_order(osv.osv):
          @param ids: List of create menu’s IDs
          @param context: A standard dictionary for contextual values """
 
-        orders = self.browse(cr, uid, ids)
+        orders = self.browse(cr, uid, ids, context=context)
         for order in orders:
             if not order.cashmove:
                 continue
diff --git a/addons/lunch/wizard/lunch_cashbox_clean.py b/addons/lunch/wizard/lunch_cashbox_clean.py
index 967d77676f1..9c03173fd0e 100644
--- a/addons/lunch/wizard/lunch_cashbox_clean.py
+++ b/addons/lunch/wizard/lunch_cashbox_clean.py
@@ -26,7 +26,7 @@ class lunch_cashbox_clean(osv.osv_memory):
      _name = "lunch.cashbox.clean"
      _description = "clean cashbox"
 
-     def set_to_zero(self, cr, uid, ids, context):
+     def set_to_zero(self, cr, uid, ids, context=None):
 
          """
          clean Cashbox. set active fields False.
@@ -36,6 +36,8 @@ class lunch_cashbox_clean(osv.osv_memory):
          @return:Dictionary {}.
          """
          #TOFIX: use orm methods
+         if context is None:
+            context = {}
          data = context and context.get('active_ids', []) or []
          cashmove_ref = self.pool.get('lunch.cashmove')
          cr.execute("select user_cashmove, box,sum(amount) from lunch_cashmove \
diff --git a/addons/lunch/wizard/lunch_order_cancel.py b/addons/lunch/wizard/lunch_order_cancel.py
index c17c4e651ff..a0c8779b323 100644
--- a/addons/lunch/wizard/lunch_order_cancel.py
+++ b/addons/lunch/wizard/lunch_order_cancel.py
@@ -27,13 +27,15 @@ class lunch_order_cancel(osv.osv_memory):
     _name = "lunch.order.cancel"
     _description = "Cancel Order"
 
-    def cancel(self, cr, uid, ids, context):
+    def cancel(self, cr, uid, ids, context=None):
         """
         Cancel cashmove entry from cashmoves and update state to draft.
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         @param ids: List  Lunch Order Cancel’s IDs
         """
+        if context is None:
+            context = {}
         data = context and context.get('active_ids', []) or []
         return self.pool.get('lunch.order').lunch_order_cancel(cr, uid, data, context)
 
diff --git a/addons/lunch/wizard/lunch_order_confirm.py b/addons/lunch/wizard/lunch_order_confirm.py
index 1827e7f5c91..4a9ba66ce9f 100644
--- a/addons/lunch/wizard/lunch_order_confirm.py
+++ b/addons/lunch/wizard/lunch_order_confirm.py
@@ -32,7 +32,7 @@ class lunch_order_confirm(osv.osv_memory):
         'confirm_cashbox':fields.many2one('lunch.cashbox', 'Name of box', required=True),
     }
 
-    def confirm(self, cr, uid, ids, context):
+    def confirm(self, cr, uid, ids, context=None):
         """
         confirm Lunch Order.Create cashmoves in launch cashmoves when state is
                         confirm in lunch order.
@@ -41,6 +41,8 @@ class lunch_order_confirm(osv.osv_memory):
         @param ids: List  Lunch Order confirm’s IDs
         @return: Dictionary {}.
         """
+        if context is None:
+            context = {}
         data = context and context.get('active_ids', []) or []
         order_ref = self.pool.get('lunch.order')
 
diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail_gateway/i18n/mail_gateway.pot
index feb34f36ee9..93d18880196 100644
--- a/addons/mail_gateway/i18n/mail_gateway.pot
+++ b/addons/mail_gateway/i18n/mail_gateway.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:02+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:02+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mail_gateway/i18n/sl.po b/addons/mail_gateway/i18n/sl.po
index fc5d248d211..d1417aa3958 100644
--- a/addons/mail_gateway/i18n/sl.po
+++ b/addons/mail_gateway/i18n/sl.po
@@ -8,25 +8,25 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-11-15 10:01+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 13:00+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:37+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mail_gateway
 #: field:mailgate.message,res_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Oznaka vira"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid "Method is not implemented"
-msgstr ""
+msgstr "Metoda ni implementirana"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
@@ -47,33 +47,33 @@ msgstr "Podrobnosti sporočila"
 #. module: mail_gateway
 #: field:mailgate.message,message_id:0
 msgid "Message Id"
-msgstr ""
+msgstr "Oznaka sporočila"
 
 #. module: mail_gateway
 #: field:mailgate.message,ref_id:0
 msgid "Reference Id"
-msgstr ""
+msgstr "Oznaka povezave"
 
 #. module: mail_gateway
 #: view:mailgate.thread:0
 msgid "Mailgateway History"
-msgstr ""
+msgstr "Zgodovina posrednika za pošto"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid "Note"
-msgstr ""
+msgstr "Opomba"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Group By..."
-msgstr ""
+msgstr "Združi po ..."
 
 #. module: mail_gateway
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Napaka! Ni mogoče rekurzivno kreirati pridruženih članov"
 
 #. module: mail_gateway
 #: help:mailgate.message,message_id:0
@@ -83,12 +83,12 @@ msgstr ""
 #. module: mail_gateway
 #: help:mailgate.message,email_to:0
 msgid "Email Recipients"
-msgstr ""
+msgstr "Prejemniki e-pošte"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Details"
-msgstr ""
+msgstr "Podrobnosti"
 
 #. module: mail_gateway
 #: view:mailgate.thread:0
@@ -110,7 +110,7 @@ msgstr ""
 #: view:mailgate.message:0
 #: field:mailgate.message,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Stranka"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:0
@@ -123,7 +123,7 @@ msgstr ""
 #: field:mailgate.message,description:0
 #: field:mailgate.message,message:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: mail_gateway
 #: help:mailgate.message,references:0
@@ -143,17 +143,17 @@ msgstr ""
 #. module: mail_gateway
 #: field:mailgate.message,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: mail_gateway
 #: field:mailgate.message,model:0
 msgid "Object Name"
-msgstr ""
+msgstr "Naziv objekta"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Partner Name"
-msgstr ""
+msgstr "Naziv partnerja"
 
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.action_view_mailgate_thread
@@ -164,7 +164,7 @@ msgstr ""
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid "Opportunity"
-msgstr ""
+msgstr "Priložnost"
 
 #. module: mail_gateway
 #: model:ir.actions.act_window,name:mail_gateway.act_res_partner_emails
@@ -172,28 +172,28 @@ msgstr ""
 #: view:mailgate.message:0
 #: field:res.partner,emails:0
 msgid "Emails"
-msgstr ""
+msgstr "Elektronska pošta"
 
 #. module: mail_gateway
 #: code:addons/mail_gateway/mail_gateway.py:0
 #, python-format
 msgid "Stage"
-msgstr ""
+msgstr "Stopnja"
 
 #. module: mail_gateway
 #: field:mailgate.message,email_to:0
 msgid "To"
-msgstr ""
+msgstr "Za"
 
 #. module: mail_gateway
 #: help:mailgate.message,email_from:0
 msgid "Email From"
-msgstr ""
+msgstr "Sporočilo od"
 
 #. module: mail_gateway
 #: view:mailgate.message:0
 msgid "Thread"
-msgstr ""
+msgstr "Nit"
 
 #. module: mail_gateway
 #: model:ir.model,name:mail_gateway.model_mailgate_message
diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py
index 443d46a4fae..ed5489fda79 100644
--- a/addons/mail_gateway/mail_gateway.py
+++ b/addons/mail_gateway/mail_gateway.py
@@ -54,8 +54,6 @@ class mailgate_thread(osv.osv):
         @param default: Dictionary of default values for copy.
         @param context: A standard dictionary for contextual values
         """
-        if context is None:
-            context = {}
         if default is None:
             default = {}
 
@@ -69,7 +67,7 @@ class mailgate_thread(osv.osv):
     def message_new(self, cr, uid, msg, context):
         raise Exception, _('Method is not implemented')
 
-    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context={}):
+    def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
         raise Exception, _('Method is not implemented')
 
     def message_followers(self, cr, uid, ids, context=None):
@@ -179,7 +177,7 @@ class mailgate_message(osv.osv):
     '''
     Mailgateway Message
     '''
-    def open_document(self, cr, uid, ids, context):
+    def open_document(self, cr, uid, ids, context=None):
         """ To Open Document
         @param self: The object pointer.
         @param cr: A database cursor
@@ -190,7 +188,7 @@ class mailgate_message(osv.osv):
         action_data = False
         if ids:
             message_id = ids[0]
-            mailgate_data = self.browse(cr, uid, message_id)
+            mailgate_data = self.browse(cr, uid, message_id, context=context)
             model = mailgate_data.model
             res_id = mailgate_data.res_id
 
@@ -205,7 +203,7 @@ class mailgate_message(osv.osv):
                     })
         return action_data
 
-    def open_attachment(self, cr, uid, ids, context):
+    def open_attachment(self, cr, uid, ids, context=None):
         """ To Open attachments
         @param self: The object pointer.
         @param cr: A database cursor
@@ -215,7 +213,7 @@ class mailgate_message(osv.osv):
         """
         action_data = False
         action_pool = self.pool.get('ir.actions.act_window')
-        message_pool = self.browse(cr ,uid, ids)[0]
+        message_pool = self.browse(cr ,uid, ids, context=context)[0]
         action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')])
         if action_ids:
             action_data = action_pool.read(cr, uid, action_ids[0], context=context)
@@ -391,7 +389,7 @@ class mailgate_tool(osv.osv_memory):
         if isinstance(message, xmlrpclib.Binary):
             message = str(message.data)
 
-        if not context:
+        if context is None:
             context = {}
 
         if custom_values is None or not isinstance(custom_values, dict):
@@ -404,7 +402,7 @@ class mailgate_tool(osv.osv_memory):
         def create_record(msg):
             att_ids = []
             if hasattr(model_pool, 'message_new'):
-                res_id = model_pool.message_new(cr, uid, msg, context)
+                res_id = model_pool.message_new(cr, uid, msg, context=context)
                 if custom_values:
                     model_pool.write(cr, uid, [res_id], custom_values, context=context)
             else:
diff --git a/addons/marketing/i18n/marketing.pot b/addons/marketing/i18n/marketing.pot
index 6f9d430a244..b865ae5beb8 100644
--- a/addons/marketing/i18n/marketing.pot
+++ b/addons/marketing/i18n/marketing.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:02+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:02+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,11 @@ msgstr ""
 msgid "Menu for Marketing"
 msgstr ""
 
+#. module: marketing
+#: help:marketing.installer,marketing_campaign:0
+msgid "Helps you to manage marketing campaigns and automate actions and communication steps."
+msgstr ""
+
 #. module: marketing
 #: field:marketing.installer,progress:0
 msgid "Configuration Progress"
@@ -41,8 +46,8 @@ msgid "Image"
 msgstr ""
 
 #. module: marketing
-#: help:marketing.installer,marketing_campaign:0
-msgid "Helps you to manage marketing campaigns and automate actions and communication steps."
+#: view:marketing.installer:0
+msgid "Configure Your Marketing Application"
 msgstr ""
 
 #. module: marketing
@@ -65,6 +70,16 @@ msgstr ""
 msgid "Profiling Tools"
 msgstr ""
 
+#. module: marketing
+#: view:marketing.installer:0
+msgid "OpenERP provides Addons to better manage your sales and marketing processes. Select the ones you would be interested in."
+msgstr ""
+
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Marketing Application Configuration"
+msgstr ""
+
 #. module: marketing
 #: field:marketing.installer,marketing_campaign:0
 msgid "Marketing Campaigns"
@@ -75,3 +90,8 @@ msgstr ""
 msgid "Helps you to perform segmentation of partners and design segmentation questionnaires"
 msgstr ""
 
+#. module: marketing
+#: view:marketing.installer:0
+msgid "Configure"
+msgstr ""
+
diff --git a/addons/marketing_campaign/i18n/marketing_campaign.pot b/addons/marketing_campaign/i18n/marketing_campaign.pot
index c1789e4f850..348470b76b9 100644
--- a/addons/marketing_campaign/i18n/marketing_campaign.pot
+++ b/addons/marketing_campaign/i18n/marketing_campaign.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:03+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:03+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:51+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:51+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index d0d18c043db..041515da436 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -172,7 +172,7 @@ Normal - the campaign runs normally and automatically sends all emails and repor
         domain = [('object_id.model', '=', record._table._name),
                   ('state', '=', 'running')]
         campaign_ids = self.search(cr, uid, domain, context=context)
-        for campaign in self.browse(cr, uid, campaign_ids, context):
+        for campaign in self.browse(cr, uid, campaign_ids, context=context):
             for activity in campaign.activity_ids:
                 if activity.signal != signal:
                     continue
@@ -247,8 +247,6 @@ class marketing_campaign_segment(osv.osv):
     }
 
     def _check_model(self, cr, uid, ids, context=None):
-        if not context:
-            context = {}
         for obj in self.browse(cr, uid, ids, context=context):
             if not obj.ir_filter_id:
                 return True
@@ -470,7 +468,7 @@ class marketing_campaign_activity(osv.osv):
 
         workitem_obj = self.pool.get('marketing.campaign.workitem')
         workitem = workitem_obj.browse(cr, uid, wi_id, context=context)
-        return action(cr, uid, activity, workitem, context)
+        return action(cr, uid, activity, workitem, context=context)
 
 marketing_campaign_activity()
 
@@ -498,7 +496,7 @@ class marketing_campaign_transition(osv.osv):
 
     def _delta(self, cr, uid, ids, context=None):
         assert len(ids) == 1
-        transition = self.browse(cr, uid, ids[0], context)
+        transition = self.browse(cr, uid, ids[0], context=context)
         if transition.trigger != 'time':
             raise ValueError('Delta is only relevant for timed transiton')
         return relativedelta(**{str(transition.interval_type): transition.interval_nbr})
@@ -531,8 +529,6 @@ class marketing_campaign_transition(osv.osv):
         'trigger': 'time',
     }
     def _check_campaign(self, cr, uid, ids, context=None):
-        if not context:
-            context = {}
         for obj in self.browse(cr, uid, ids, context=context):
             if obj.activity_from_id.campaign_id != obj.activity_to_id.campaign_id:
                 return False
@@ -566,8 +562,6 @@ class marketing_campaign_workitem(osv.osv):
 
     def _resource_search(self, cr, uid, obj, name, args, domain=None, context=None):
         """Returns id of workitem whose resource_name matches  with the given name"""
-        if context is None:
-            context = {}
         if not len(args):
             return []
 
@@ -614,13 +608,13 @@ class marketing_campaign_workitem(osv.osv):
         'date': False,
     }
 
-    def button_draft(self, cr, uid, workitem_ids, context={}):
+    def button_draft(self, cr, uid, workitem_ids, context=None):
         for wi in self.browse(cr, uid, workitem_ids, context=context):
             if wi.state in ('exception', 'cancelled'):
                 self.write(cr, uid, [wi.id], {'state':'todo'}, context=context)
         return True
 
-    def button_cancel(self, cr, uid, workitem_ids, context={}):
+    def button_cancel(self, cr, uid, workitem_ids, context=None):
         for wi in self.browse(cr, uid, workitem_ids, context=context):
             if wi.state in ('todo','exception'):
                 self.write(cr, uid, [wi.id], {'state':'cancelled'}, context=context)
@@ -714,8 +708,8 @@ class marketing_campaign_workitem(osv.osv):
                      context=context)
 
     def process(self, cr, uid, workitem_ids, context=None):
-        for wi in self.browse(cr, uid, workitem_ids, context):
-            self._process_one(cr, uid, wi, context)
+        for wi in self.browse(cr, uid, workitem_ids, context=context):
+            self._process_one(cr, uid, wi, context=context)
         return True
 
     def process_all(self, cr, uid, camp_ids=None, context=None):
@@ -735,12 +729,12 @@ class marketing_campaign_workitem(osv.osv):
                 if not workitem_ids:
                     break
 
-                self.process(cr, uid, workitem_ids, context)
+                self.process(cr, uid, workitem_ids, context=context)
         return True
 
-    def preview(self, cr, uid, ids, context):
+    def preview(self, cr, uid, ids, context=None):
         res = {}
-        wi_obj = self.browse(cr, uid, ids[0], context)
+        wi_obj = self.browse(cr, uid, ids[0], context=context)
         if wi_obj.activity_id.type == 'email':
             data_obj = self.pool.get('ir.model.data')
             data_id = data_obj._get_id(cr, uid, 'email_template', 'email_template_preview_form')
@@ -796,7 +790,7 @@ class report_xml(osv.osv):
             context = {}
         object_id = context.get('object_id')
         if object_id:
-            model = self.pool.get('ir.model').browse(cr, uid, object_id).model
+            model = self.pool.get('ir.model').browse(cr, uid, object_id, context=context).model
             args.append(('model', '=', model))
         return super(report_xml, self).search(cr, uid, args, offset, limit, order, context, count)
 
diff --git a/addons/marketing_campaign/report/campaign_analysis.py b/addons/marketing_campaign/report/campaign_analysis.py
index 066423c546c..a4dbb1c4769 100644
--- a/addons/marketing_campaign/report/campaign_analysis.py
+++ b/addons/marketing_campaign/report/campaign_analysis.py
@@ -26,7 +26,7 @@ class campaign_analysis(osv.osv):
     _description = "Campaign Analysis"
     _auto = False
     _rec_name = 'date'
-    def _total_cost(self, cr, uid, ids, field_name, arg, context={}):
+    def _total_cost(self, cr, uid, ids, field_name, arg, context=None):
         """
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
@@ -34,7 +34,7 @@ class campaign_analysis(osv.osv):
             @param context: A standard dictionary for contextual values
         """
         result = {}
-        for ca_obj in self.browse(cr, uid, ids, context):
+        for ca_obj in self.browse(cr, uid, ids, context=context):
             wi_ids = self.pool.get('marketing.campaign.workitem').search(cr, uid,
                         [('segment_id.campaign_id', '=', ca_obj.campaign_id.id)])
             total_cost = ca_obj.activity_id.variable_cost + \
diff --git a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
index 8bdc2fca55f..78fbf3ee653 100644
--- a/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
+++ b/addons/marketing_campaign_crm_demo/i18n/marketing_campaign_crm_demo.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:03+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:03+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:52+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:52+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/membership/i18n/fr.po b/addons/membership/i18n/fr.po
index 7343aae081d..cbefccd404a 100644
--- a/addons/membership/i18n/fr.po
+++ b/addons/membership/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/membership/i18n/membership.pot b/addons/membership/i18n/membership.pot
index a578a7d38e2..0bdbf73ac1e 100644
--- a/addons/membership/i18n/membership.pot
+++ b/addons/membership/i18n/membership.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:15:58+0000\n"
-"PO-Revision-Date: 2010-12-10 17:15:58+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:53+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -161,11 +161,6 @@ msgstr ""
 msgid "Partner doesn't have an address to make the invoice."
 msgstr ""
 
-#. module: membership
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
 #. module: membership
 #: model:ir.model,name:membership.model_res_partner
 #: field:membership.membership_line,partner:0
@@ -488,11 +483,6 @@ msgstr ""
 msgid "Accounting Info"
 msgstr ""
 
-#. module: membership
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
-
 #. module: membership
 #: field:res.partner,membership_cancel:0
 msgid "Cancel membership date"
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 86c35347691..7353ac33336 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -366,7 +366,7 @@ class Partner(osv.osv):
         'membership_cancel': False,
     }
 
-    def _check_recursion(self, cr, uid, ids):
+    def _check_recursion(self, cr, uid, ids, context=None):
         """Check  Recursive  for Associated Members.
         """
         level = 100
@@ -385,8 +385,6 @@ class Partner(osv.osv):
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
-        if context is None:
-            context = {}
         default = default.copy()
         default['member_lines'] = []
         return super(Partner, self).copy(cr, uid, id, default, context=context)
@@ -401,8 +399,6 @@ class Partner(osv.osv):
         invoice_tax_obj = self.pool.get('account.invoice.tax')
         product_id = product_id or datas.get('membership_product_id', False)
         amount = datas.get('amount', 0.0)
-        if not context:
-            context={}
         invoice_list = []
         if type(ids) in (int, long,):
             ids = [ids]
@@ -460,6 +456,8 @@ class Product(osv.osv):
 
     def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         model_obj = self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
 
         if ('product' in context) and (context['product']=='membership_product'):
             model_data_ids_form = model_obj.search(cr, user, [('model','=','ir.ui.view'), ('name', 'in', ['membership_products_form', 'membership_products_tree'])], context=context)
@@ -511,8 +509,6 @@ class account_invoice_line(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         """Overrides orm write method
         """
-        if not context:
-            context={}
         member_line_obj = self.pool.get('membership.membership_line')
         res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
         for line in self.browse(cr, uid, ids, context=context):
@@ -541,8 +537,6 @@ class account_invoice_line(osv.osv):
     def unlink(self, cr, uid, ids, context=None):
         """Remove Membership Line Record for Account Invoice Line
         """
-        if not context:
-            context={}
         member_line_obj = self.pool.get('membership.membership_line')
         for id in ids:
             ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', id)], context=context)
diff --git a/addons/membership/wizard/membership_invoice.py b/addons/membership/wizard/membership_invoice.py
index 670e3470eb2..b97926e564c 100644
--- a/addons/membership/wizard/membership_invoice.py
+++ b/addons/membership/wizard/membership_invoice.py
@@ -42,7 +42,7 @@ class membership_invoice(osv.osv_memory):
         mod_obj = self.pool.get('ir.model.data')
         partner_obj = self.pool.get('res.partner')
         datas = {}
-        if not context:
+        if context is None:
             context = {}
         data = self.browse(cr, uid, ids, context=context)
         if data:
diff --git a/addons/mrp/i18n/mrp.pot b/addons/mrp/i18n/mrp.pot
index 6f1bfad9ac4..6a3c87b5877 100644
--- a/addons/mrp/i18n/mrp.pot
+++ b/addons/mrp/i18n/mrp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:06+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:06+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:54+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:54+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -363,6 +363,11 @@ msgstr ""
 msgid "Advanced Routes"
 msgstr ""
 
+#. module: mrp
+#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
+msgid "Working Time"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_in_out_picking_tree
 msgid "Weekly Stock Value Variation"
@@ -689,6 +694,11 @@ msgstr ""
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
 
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Add more functionalities to the core Manufacturing Application with the following addons."
+msgstr ""
+
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "Printing date"
@@ -964,6 +974,11 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
+#. module: mrp
+#: view:mrp.installer:0
+msgid "MRP Application Configuration"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.installer,mrp_jit:0
 msgid "Enables Just In Time computation of procurement orders.\n"
@@ -1140,6 +1155,11 @@ msgstr ""
 msgid "Revisions"
 msgstr ""
 
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure Your Manufacturing Resource Planning Application"
+msgstr ""
+
 #. module: mrp
 #: model:ir.actions.act_window,help:mrp.mrp_production_action
 msgid "Manufacturing Orders are usually proposed automatically by OpenERP based on the bill of materials and the procurement rules, but you can also create manufacturing orders manually. OpenERP will handle the consumation of the raw materials (stock decrease) and the production of the finished products (stock increase) when the order is processed."
@@ -1792,11 +1812,6 @@ msgstr ""
 msgid "Rounding applied on the product quantity."
 msgstr ""
 
-#. module: mrp
-#: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
-msgid "Working Period"
-msgstr ""
-
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
@@ -1807,6 +1822,11 @@ msgstr ""
 msgid "Parent Routing"
 msgstr ""
 
+#. module: mrp
+#: view:mrp.installer:0
+msgid "Configure"
+msgstr ""
+
 #. module: mrp
 #: help:mrp.workcenter,time_start:0
 msgid "Time in hours for the setup."
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index a5d53fbf31d..135d5007f90 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -120,7 +120,7 @@ class mrp_bom(osv.osv):
     _name = 'mrp.bom'
     _description = 'Bill of Material'
 
-    def _child_compute(self, cr, uid, ids, name, arg, context={}):
+    def _child_compute(self, cr, uid, ids, name, arg, context=None):
         """ Gets child bom.
         @param self: The object pointer
         @param cr: The current row, from the database cursor,
@@ -132,13 +132,15 @@ class mrp_bom(osv.osv):
         @return:  Dictionary of values
         """
         result = {}
+        if context is None:
+            context = {}
         bom_obj = self.pool.get('mrp.bom')
         bom_id = context and context.get('active_id', False) or False
         cr.execute('select id from mrp_bom')
         if all(bom_id != r[0] for r in cr.fetchall()):
             ids.sort()
             bom_id = ids[0]
-        bom_parent = bom_obj.browse(cr, uid, bom_id)
+        bom_parent = bom_obj.browse(cr, uid, bom_id, context=context)
         for bom in self.browse(cr, uid, ids, context=context):
             if (bom_parent) or (bom.id == bom_id):
                 result[bom.id] = map(lambda x: x.id, bom.bom_lines)
@@ -155,14 +157,14 @@ class mrp_bom(osv.osv):
 
         return result
 
-    def _compute_type(self, cr, uid, ids, field_name, arg, context):
+    def _compute_type(self, cr, uid, ids, field_name, arg, context=None):
         """ Sets particular method for the selected bom type.
         @param field_name: Name of the field
         @param arg: User defined argument
         @return:  Dictionary of values
         """
         res = dict(map(lambda x: (x,''), ids))
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.type == 'phantom' and not line.bom_id:
                 res[line.id] = 'set'
                 continue
@@ -217,7 +219,7 @@ class mrp_bom(osv.osv):
             'You should install the mrp_subproduct module if you want to manage extra products on BoMs !'),
     ]
 
-    def _check_recursion(self, cr, uid, ids):
+    def _check_recursion(self, cr, uid, ids, context=None):
         level = 100
         while len(ids):
             cr.execute('select distinct bom_id from mrp_bom where id IN %s',(tuple(ids),))
@@ -231,14 +233,14 @@ class mrp_bom(osv.osv):
     ]
 
 
-    def onchange_product_id(self, cr, uid, ids, product_id, name, context={}):
+    def onchange_product_id(self, cr, uid, ids, product_id, name, context=None):
         """ Changes UoM and name if product_id changes.
         @param name: Name of the field
         @param product_id: Changed product_id
         @return:  Dictionary of changed values
         """
         if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v = {'product_uom': prod.uom_id.id}
             if not name:
                 v['name'] = prod.name
@@ -357,7 +359,7 @@ class mrp_production(osv.osv):
     _description = 'Manufacturing Order'
     _date_name  = 'date_planned'
 
-    def _production_calc(self, cr, uid, ids, prop, unknow_none, context={}):
+    def _production_calc(self, cr, uid, ids, prop, unknow_none, context=None):
         """ Calculates total hours and total no. of cycles for a production order.
         @param prop: Name of field.
         @param unknow_none:
@@ -374,7 +376,7 @@ class mrp_production(osv.osv):
                 result[prod.id]['cycle_total'] += wc.cycle
         return result
 
-    def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
+    def _production_date_end(self, cr, uid, ids, prop, unknow_none, context=None):
         """ Finds production end date.
         @param prop: Name of field.
         @param unknow_none:
@@ -385,7 +387,7 @@ class mrp_production(osv.osv):
             result[prod.id] = prod.date_planned
         return result
 
-    def _production_date(self, cr, uid, ids, prop, unknow_none, context={}):
+    def _production_date(self, cr, uid, ids, prop, unknow_none, context=None):
         """ Finds production planned date.
         @param prop: Name of field.
         @param unknow_none:
@@ -447,8 +449,8 @@ class mrp_production(osv.osv):
     }
     _order = 'priority desc, date_planned asc';
 
-    def _check_qty(self, cr, uid, ids):
-        orders = self.browse(cr, uid, ids)
+    def _check_qty(self, cr, uid, ids, context=None):
+        orders = self.browse(cr, uid, ids, context=context)
         for order in orders:
             if order.product_qty <= 0:
                 return False
@@ -482,7 +484,7 @@ class mrp_production(osv.osv):
         })
         return super(mrp_production, self).copy(cr, uid, id, default, context)
 
-    def location_id_change(self, cr, uid, ids, src, dest, context={}):
+    def location_id_change(self, cr, uid, ids, src, dest, context=None):
         """ Changes destination location if source location is changed.
         @param src: Source location id.
         @param dest: Destination location id.
@@ -639,10 +641,9 @@ class mrp_production(osv.osv):
         @param production_mode: specify production mode (consume/consume&produce).
         @return: True
         """
-
         stock_mov_obj = self.pool.get('stock.move')
-        production = self.browse(cr, uid, production_id)
-
+        production = self.browse(cr, uid, production_id, context=context)
+        
         final_product_todo = []
 
         produced_qty = 0
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 67d0cd1c739..b19c2c0e15e 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -60,7 +60,7 @@ class procurement_order(osv.osv):
                     return phantom_bom_id 
         return False
     
-    def action_produce_assign_product(self, cr, uid, ids, context={}):
+    def action_produce_assign_product(self, cr, uid, ids, context=None):
         """ This is action which call from workflow to assign production order to procurements
         @return: True
         """
@@ -69,7 +69,7 @@ class procurement_order(osv.osv):
         res = res.values()
         return len(res) and res[0] or 0
     
-    def make_mo(self, cr, uid, ids, context={}):
+    def make_mo(self, cr, uid, ids, context=None):
         """ Make Manufacturing(production) order from procurement
         @return: New created Production Orders procurement wise 
         """
@@ -79,7 +79,7 @@ class procurement_order(osv.osv):
         move_obj = self.pool.get('stock.move')
         wf_service = netsvc.LocalService("workflow")
         procurement_obj = self.pool.get('procurement.order')
-        for procurement in procurement_obj.browse(cr, uid, ids):
+        for procurement in procurement_obj.browse(cr, uid, ids, context=context):
             res_id = procurement.move_id.id
             loc_id = procurement.location_id.id
             newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index a14634208ff..bb9bc27625f 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -26,13 +26,13 @@ from tools.translate import _
 class product_product(osv.osv):
     _inherit = "product.product"    
 
-    def get_product_accounts(self, cr, uid, product_id, context={}):
+    def get_product_accounts(self, cr, uid, product_id, context=None):
         """ To get the stock input account, stock output account and stock journal related to product.
         @param product_id: product id            
         @return: dictionary which contains information regarding stock input account, stock output account and stock journal
-        """           
+        """
         product_obj = self.pool.get('product.product').browse(cr, uid, product_id, False)
-        res = super(product_product,self).get_product_accounts(cr, uid, product_id, context)
+        res = super(product_product,self).get_product_accounts(cr, uid, product_id, context=context)
         stock_input_acc = product_obj.property_stock_account_input and product_obj.property_stock_account_input.id or False 
         if not stock_input_acc:
             stock_input_acc = product_obj.categ_id.property_stock_account_input_categ and product_obj.categ_id.property_stock_account_input_categ.id or False
@@ -54,12 +54,14 @@ class product_product(osv.osv):
         "bom_ids": fields.one2many('mrp.bom', 'product_id','Bill of Materials'),
     }
 
-    def do_change_standard_price(self, cr, uid, ids, datas, context={}):
+    def do_change_standard_price(self, cr, uid, ids, datas, context=None):
         """ Changes the Standard Price of Product and parent products and creates an account move accordingly.
         @param datas: dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
         @param context: A standard dictionary
         @return:
         """
+        if context is None:
+            context = {}
         res = super(product_product, self).do_change_standard_price(cr, uid, ids, datas, context=context)
         bom_obj = self.pool.get('mrp.bom')
         change = context.get('change_parent_price', False)
@@ -85,7 +87,7 @@ class product_product(osv.osv):
 
         bom_ids = bom_obj.search(cr, uid, [('product_id', 'in', ids)])
 
-        for bom in bom_obj.browse(cr, uid, bom_ids):
+        for bom in bom_obj.browse(cr, uid, bom_ids, context=context):
             _compute_price(bom)
 
 product_product()
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 9a7bb532acc..53063bd7ad6 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -31,7 +31,7 @@ from tools.translate import _
 
 #FIXME: we should use toxml
 class report_custom(report_rml):
-    def create_xml(self, cr, uid, ids, datas, context={}):
+    def create_xml(self, cr, uid, ids, datas, context=None):
         number = (datas.get('form', False) and datas['form']['number']) or 1
         pool = pooler.get_pool(cr.dbname)
         product_pool = pool.get('product.product')
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 9be42edd860..7c8c9d9e575 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -101,7 +101,7 @@ class report_custom(report_int):
             return dates
         return {}
 
-    def create(self, cr, uid, ids, datas, context={}):
+    def create(self, cr, uid, ids, datas, context=None):
         assert len(ids), 'You should provide some ids!'
         colors = choice_colors(len(ids))
         cr.execute(
diff --git a/addons/mrp/stock.py b/addons/mrp/stock.py
index caed38654ac..3e50552cd9e 100644
--- a/addons/mrp/stock.py
+++ b/addons/mrp/stock.py
@@ -31,7 +31,7 @@ class StockMove(osv.osv):
         'production_id': fields.many2one('mrp.production', 'Production', select=True),
     }
     
-    def _action_explode(self, cr, uid, move, context={}):
+    def _action_explode(self, cr, uid, move, context=None):
         """ Explodes pickings.
         @param move: Stock moves
         @return: True
@@ -48,7 +48,7 @@ class StockMove(osv.osv):
                 ('type','=','phantom')])
             if bis:
                 factor = move.product_qty
-                bom_point = bom_obj.browse(cr, uid, bis[0])
+                bom_point = bom_obj.browse(cr, uid, bis[0], context=context)
                 res = bom_obj._bom_explode(cr, uid, bom_point, factor, [])
                 dest = move.product_id.product_tmpl_id.property_stock_production.id
                 state = 'confirmed'
@@ -126,7 +126,7 @@ class StockMove(osv.osv):
         res = []
         production_obj = self.pool.get('mrp.production')
         wf_service = netsvc.LocalService("workflow")
-        for move in self.browse(cr, uid, ids):
+        for move in self.browse(cr, uid, ids, context=context):
             new_moves = super(StockMove, self).action_scrap(cr, uid, [move.id], product_qty, location_id, context=context)
             self.write(cr, uid, [move.id], {'prodlot_id': False, 'tracking_id': False})
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
@@ -170,7 +170,7 @@ class spilt_in_production_lot(osv.osv_memory):
         """  
         production_obj = self.pool.get('mrp.production')
         move_obj = self.pool.get('stock.move')  
-        res = []      
+        res = []
         for move in move_obj.browse(cr, uid, move_ids, context=context):
             new_moves = super(spilt_in_production_lot, self).split(cr, uid, ids, move_ids, context=context)
             production_ids = production_obj.search(cr, uid, [('move_lines', 'in', [move.id])])
diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py
index 0cee5ea60a3..87b6d00190e 100644
--- a/addons/mrp/wizard/change_production_qty.py
+++ b/addons/mrp/wizard/change_production_qty.py
@@ -30,7 +30,7 @@ class change_production_qty(osv.osv_memory):
         'product_qty': fields.float('Product Qty', required=True),
     }
 
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
         @param self: The object pointer.
         @param cr: A database cursor
@@ -39,14 +39,16 @@ class change_production_qty(osv.osv_memory):
         @param context: A standard dictionary 
         @return: A dictionary which of fields with values. 
         """        
+        if context is None:
+            context = {}
         res = super(change_production_qty, self).default_get(cr, uid, fields, context=context)        
         prod_obj = self.pool.get('mrp.production')
-        prod = prod_obj.browse(cr, uid, context.get('active_id'))
+        prod = prod_obj.browse(cr, uid, context.get('active_id'), context=context)
         if 'product_qty' in fields:
             res.update({'product_qty': prod.product_qty})  
         return res
         
-    def change_prod_qty(self, cr, uid, ids, context):
+    def change_prod_qty(self, cr, uid, ids, context=None):
         """ 
         Changes the Quantity of Product.
         @param self: The object pointer.
@@ -60,8 +62,8 @@ class change_production_qty(osv.osv_memory):
         assert record_id, _('Active Id is not found')
         prod_obj = self.pool.get('mrp.production')
         bom_obj = self.pool.get('mrp.bom')
-        for wiz_qty in self.browse(cr, uid, ids):
-            prod = prod_obj.browse(cr, uid,record_id)
+        for wiz_qty in self.browse(cr, uid, ids, context=context):
+            prod = prod_obj.browse(cr, uid, record_id, context=context)
             prod_obj.write(cr, uid,prod.id, {'product_qty': wiz_qty.product_qty})
             prod_obj.action_compute(cr, uid, [prod.id])
         
diff --git a/addons/mrp/wizard/mrp_change_standard_price.py b/addons/mrp/wizard/mrp_change_standard_price.py
index 3fc63bcc421..4ee92aac16b 100644
--- a/addons/mrp/wizard/mrp_change_standard_price.py
+++ b/addons/mrp/wizard/mrp_change_standard_price.py
@@ -31,7 +31,7 @@ class change_standard_price(osv.osv_memory):
     }
     
     
-    def change_price(self, cr, uid, ids, context):
+    def change_price(self, cr, uid, ids, context=None):
         """ Changes the Standard Price of Parent Product according to BoM 
             only when the field 'change_parent_price' is True.
             And creates an account move accordingly.
@@ -42,7 +42,9 @@ class change_standard_price(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
-        res = self.browse(cr, uid, ids) 
+        if context is None:
+            context = {}
+        res = self.browse(cr, uid, ids, context=context) 
         context.update({'change_parent_price': res[0].change_parent_price})
         return super(change_standard_price, self).change_price(cr, uid, ids, context=context)
     
diff --git a/addons/mrp/wizard/mrp_price.py b/addons/mrp/wizard/mrp_price.py
index b136326a2dc..8e26561adad 100644
--- a/addons/mrp/wizard/mrp_price.py
+++ b/addons/mrp/wizard/mrp_price.py
@@ -39,6 +39,8 @@ class mrp_price(osv.osv_memory):
         @param context: A standard dictionary
         @return : Report
         """
+        if context is None:
+            context = {}
         datas = {'ids' : context.get('active_ids',[])}
         res = self.read(cr, uid, ids, ['number'])
         res = res and res[0] or {}
diff --git a/addons/mrp/wizard/mrp_product_produce.py b/addons/mrp/wizard/mrp_product_produce.py
index 16729b7eccf..6052cdb56f7 100644
--- a/addons/mrp/wizard/mrp_product_produce.py
+++ b/addons/mrp/wizard/mrp_product_produce.py
@@ -34,7 +34,7 @@ class mrp_product_produce(osv.osv_memory):
                                         "and it will finish the production order when total ordered quantities are produced."),
     }
 
-    def _get_product_qty(self, cr, uid, context):
+    def _get_product_qty(self, cr, uid, context=None):
         """ To obtain product quantity
         @param self: The object pointer.
         @param cr: A database cursor
@@ -42,6 +42,8 @@ class mrp_product_produce(osv.osv_memory):
         @param context: A standard dictionary
         @return: Quantity
         """
+        if context is None:
+            context = {}
         prod = self.pool.get('mrp.production').browse(cr, uid,
                                 context['active_id'], context=context)
         done = 0.0
@@ -55,7 +57,7 @@ class mrp_product_produce(osv.osv_memory):
          'mode': lambda *x: 'consume_produce'
     }
 
-    def do_produce(self, cr, uid, ids, context={}):
+    def do_produce(self, cr, uid, ids, context=None):
         """ To check the product type
         @param self: The object pointer.
         @param cr: A database cursor
@@ -64,9 +66,11 @@ class mrp_product_produce(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context is None:
+            context = {}
         prod_obj = self.pool.get('mrp.production')
-        move_ids = context['active_ids']
-        for data in self.read(cr, uid, ids):
+        move_ids = context.get('active_ids', [])
+        for data in self.read(cr, uid, ids, context=context):
             for move_id in move_ids:
                 prod_obj.action_produce(cr, uid, move_id,
                                     data['product_qty'], data['mode'], context=context)
diff --git a/addons/mrp/wizard/mrp_track_prod.py b/addons/mrp/wizard/mrp_track_prod.py
index 43929b47dc7..4b883abf98c 100644
--- a/addons/mrp/wizard/mrp_track_prod.py
+++ b/addons/mrp/wizard/mrp_track_prod.py
@@ -38,7 +38,7 @@ class mrp_track_move(osv.osv_memory):
         if record_id:
             prod_obj = self.pool.get('mrp.production')
             try:
-                prod = prod_obj.browse(cr, uid, record_id)
+                prod = prod_obj.browse(cr, uid, record_id, context=context)
                 for m in [line for line in prod.move_created_ids]:
                     if 'track%s'%(m.id) not in self._columns:
                         self._columns['track%s'%(m.id)] = fields.boolean(string=m.product_id.name)
@@ -54,6 +54,8 @@ class mrp_track_move(osv.osv_memory):
          @param context: A standard dictionary 
          @return: New arch of view.
         """
+        if context is None:
+            context = {}
         res = super(mrp_track_move, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         record_id = context and context.get('active_id', False) or False
         active_model = context.get('active_model')
@@ -62,7 +64,7 @@ class mrp_track_move(osv.osv_memory):
             return res
         
         prod_obj = self.pool.get('mrp.production')
-        prod = prod_obj.browse(cr, uid, record_id)
+        prod = prod_obj.browse(cr, uid, record_id, context=context)
         if prod.state != 'done':
             res['arch'] = '''<form string="Track lines">
                                 <label colspan="4" string="You can not split an unfinished production Output." />
@@ -87,7 +89,7 @@ class mrp_track_move(osv.osv_memory):
         
         return res
     
-    def track_lines(self, cr, uid, ids, context):
+    def track_lines(self, cr, uid, ids, context=None):
         """ Tracks Finished products and splits products to finish lines.
          @param self: The object pointer.
          @param cr: A database cursor
@@ -96,17 +98,19 @@ class mrp_track_move(osv.osv_memory):
          @param context: A standard dictionary 
          @return: 
         """
+        if context is None:
+            context = {}
         record_id = context and context.get('active_id', False) or False
         assert record_id, 'Active ID not found'
         data = self.read(cr, uid, ids[0])
         prod_obj = self.pool.get('mrp.production')
-        prod = prod_obj.browse(cr, uid, record_id)
+        prod = prod_obj.browse(cr, uid, record_id, context=context)
         if not prod.move_created_ids and prod.state != 'done':
             return {}
         prodlot_obj = self.pool.get('stock.production.lot')
         move_obj = self.pool.get('stock.move')
         move_ids = [m.id for m in [line for line in prod.move_created_ids]]
-        for idx, move in enumerate(move_obj.browse(cr, uid, move_ids)):
+        for idx, move in enumerate(move_obj.browse(cr, uid, move_ids, context=context)):
             if data['track%s' %move.id]:
                 for idx in range(int(move.product_qty)):
                     update_val = {'product_qty': 1}
diff --git a/addons/mrp/wizard/mrp_workcenter_load.py b/addons/mrp/wizard/mrp_workcenter_load.py
index 7f6dfd16b85..fc4c90f8c54 100644
--- a/addons/mrp/wizard/mrp_workcenter_load.py
+++ b/addons/mrp/wizard/mrp_workcenter_load.py
@@ -38,6 +38,8 @@ class mrp_workcenter_load(osv.osv_memory):
         @param context: A standard dictionary
         @return : Report
         """
+        if context is None:
+            context = {}
         datas = {'ids' : context.get('active_ids',[])}
         res = self.read(cr, uid, ids, ['time_unit','measure_unit'])
         res = res and res[0] or {}
diff --git a/addons/mrp_jit/i18n/mrp_jit.pot b/addons/mrp_jit/i18n/mrp_jit.pot
index b76a61abc41..079ae643f09 100644
--- a/addons/mrp_jit/i18n/mrp_jit.pot
+++ b/addons/mrp_jit/i18n/mrp_jit.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:06+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:06+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:55+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:55+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mrp_jit/i18n/vi.po b/addons/mrp_jit/i18n/vi.po
index c6e2c41df91..259e92e5661 100644
--- a/addons/mrp_jit/i18n/vi.po
+++ b/addons/mrp_jit/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-12 07:54+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 05:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
diff --git a/addons/mrp_operations/i18n/es.po b/addons/mrp_operations/i18n/es.po
index 4f7ec99ea70..e3d8d4cee32 100644
--- a/addons/mrp_operations/i18n/es.po
+++ b/addons/mrp_operations/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-10-30 13:28+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:12+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -29,7 +28,7 @@ msgstr "Órdenes de producción"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Cancelar la operación"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
@@ -46,23 +45,23 @@ msgstr "Orden de producción no puede empezar en estado [%s]"
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
 msgid "Information from the routing definition."
-msgstr ""
+msgstr "Información sobre la definición de la ruta"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
 #: model:ir.ui.menu,name:mrp_operations.menu_mrp_production_wc_resource_planning
 msgid "Work Centers"
-msgstr ""
+msgstr "Centros de trabajo"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -94,13 +93,13 @@ msgstr "Serializado Libre"
 #. module: mrp_operations
 #: model:process.process,name:mrp_operations.process_process_mrpoperationprocess0
 msgid "Mrp Operations"
-msgstr ""
+msgstr "Operaciones Mrp"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_productionorder0
@@ -110,12 +109,12 @@ msgstr "Orden de producción"
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Excepción albarán"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_productionstart0
 msgid "Creation of the work order"
-msgstr ""
+msgstr "Creación de órden de trabajo"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -135,7 +134,7 @@ msgstr "Centro de producción"
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_productionstart0
 msgid "The work orders are created on the basis of the production order."
-msgstr ""
+msgstr "Las órdenes de trabajo son creadas en base a la orden de producción"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -148,7 +147,7 @@ msgstr "¡Error!"
 #: selection:mrp.workorder,state:0
 #: selection:mrp_operations.operation.code,start_stop:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelada"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_confirm_action
@@ -164,12 +163,12 @@ msgstr "Operaciones"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Moviemiento de stock"
 
 #. module: mrp_operations
 #: field:mrp.workorder,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Nº de líneas"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
@@ -190,13 +189,13 @@ msgstr "En Producción"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.action_report_mrp_workorder
 #: model:ir.model,name:mrp_operations.model_mrp_production_workcenter_line
 msgid "Work Order"
-msgstr ""
+msgstr "Orden de trabajo"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_workstartoperation0
@@ -208,7 +207,7 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Month -1"
-msgstr ""
+msgstr "Mes -1"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,state:0
@@ -243,12 +242,12 @@ msgstr "¡No hay operación a cancelar!"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_qty:0
 msgid "Product Qty"
-msgstr ""
+msgstr "Ctdad producto"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
@@ -277,27 +276,29 @@ msgid ""
 "Operation has already started !You  can either Pause /Finish/Cancel the "
 "operation"
 msgstr ""
+"¡La operación ha sido iniciada! Puede ponerla en pausa / finalizar/cancelar "
+"la operación"
 
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_canceloperation0
 msgid "Operation Cancelled"
-msgstr ""
+msgstr "Operación cancelada"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 #: field:mrp.workorder,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mes"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -312,7 +313,7 @@ msgstr "mrp_operations.operation"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_workorder
 msgid "Work Order Report"
-msgstr ""
+msgstr "Informe orden de trabajo"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,date_start:0
@@ -345,7 +346,7 @@ msgstr "En proceso"
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Orden de fabricación"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -365,6 +366,8 @@ msgid ""
 "When the operation needs to be cancelled, you can do it in the work order "
 "form."
 msgstr ""
+"Cuando la operación necesita ser cancelada, puede hacerlo en el formulario "
+"de la orden de trabajo."
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -376,12 +379,12 @@ msgstr "Cambiar a borrador"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_cycles:0
 msgid "Total Cycles"
-msgstr ""
+msgstr "Ciclos totales"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Pending"
-msgstr ""
+msgstr "Pendiente"
 
 #. module: mrp_operations
 #: view:mrp_operations.operation.code:0
@@ -397,17 +400,17 @@ msgstr " ¡No puede reanudar las operaciones que no estén en estado Detenida!"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Started"
-msgstr ""
+msgstr "Iniciada"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -434,12 +437,12 @@ msgstr "Planeación de Ordenes de Trabajo"
 #: view:mrp.production.workcenter.line:0
 #: field:mrp.workorder,date:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -449,22 +452,22 @@ msgstr ""
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Search"
-msgstr ""
+msgstr "Buscar"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
 msgid "Finish the operation."
-msgstr ""
+msgstr "Terminar la operación."
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -475,7 +478,7 @@ msgstr "¡La operación todavía no se ha iniciado!"
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_productionorder0
 msgid "Information from the production order."
-msgstr ""
+msgstr "Inforamción de la orden de fabricación"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -486,7 +489,7 @@ msgstr "¡Disculpe!"
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,code_id:0
@@ -518,7 +521,7 @@ msgstr ""
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_code_action
 msgid "Operation Codes"
-msgstr ""
+msgstr "Códigos de operaciones"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,qty:0
@@ -528,7 +531,7 @@ msgstr "Ctd."
 #. module: mrp_operations
 #: model:process.node,name:mrp_operations.process_node_doneoperation0
 msgid "Operation Done"
-msgstr ""
+msgstr "Operación realizada"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,production_state:0
@@ -571,17 +574,17 @@ msgstr "Información"
 #. module: mrp_operations
 #: model:ir.actions.report.xml,name:mrp_operations.report_wc_barcode
 msgid "Work Centers Barcode"
-msgstr ""
+msgstr "Códigos de barra de centros de trabajo"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You must assign a production lot for this product"
-msgstr ""
+msgstr "Debe asignar un lote de producción para este producto"
 
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Late"
-msgstr ""
+msgstr "Retrasado"
 
 #. module: mrp_operations
 #: field:mrp.workorder,delay:0
@@ -599,7 +602,7 @@ msgstr "Producción"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Search Work Orders"
-msgstr ""
+msgstr "Buscar Órdenes de Trabajo"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation,workcenter_id:0
@@ -628,7 +631,7 @@ msgstr "Producto"
 #: view:mrp.workorder:0
 #: field:mrp.workorder,total_hours:0
 msgid "Total Hours"
-msgstr ""
+msgstr "Total horas"
 
 #. module: mrp_operations
 #: help:mrp.production,allow_reorder:0
@@ -647,7 +650,7 @@ msgstr ")"
 #. module: mrp_operations
 #: model:ir.ui.menu,name:mrp_operations.menu_report_mrp_workorders_tree
 msgid "Work Order Analysis"
-msgstr ""
+msgstr "Análisisde órdenes de trabajo"
 
 #. module: mrp_operations
 #: view:mrp.production:0
@@ -665,7 +668,7 @@ msgstr "UdM"
 #. module: mrp_operations
 #: view:mrp.production.workcenter.line:0
 msgid "Hours by Work Center"
-msgstr ""
+msgstr "Horas por centro de trabajo"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,delay:0
@@ -682,32 +685,32 @@ msgstr "Fecha final"
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
 msgid "Operation cancelled"
-msgstr ""
+msgstr "Operación cancelada"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_startoperation0
 msgid "Start the operation."
-msgstr ""
+msgstr "Iniciar la operación"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
 msgid "Operation done"
-msgstr ""
+msgstr "Operación realizada"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Nº línea órdenes"
 
 #. module: mrp_operations
 #: model:process.transition,note:mrp_operations.process_transition_startdoneoperation0
@@ -719,17 +722,17 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
 msgid "Details of the work order"
-msgstr ""
+msgstr "Detalles de la orden de trabajo"
 
 #. module: mrp_operations
 #: field:mrp.production.workcenter.line,production_state:0
 msgid "Production State"
-msgstr ""
+msgstr "Estado producción"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -745,12 +748,12 @@ msgstr "Duración"
 #. module: mrp_operations
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "¡La cantidad de la orden no puede ser negativa o cero!"
 
 #. module: mrp_operations
 #: constraint:stock.move:0
 msgid "You try to assign a lot which is not from the same product"
-msgstr ""
+msgstr "Está intentando asignar un lote que no es del mismo producto"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/mrp_operations/i18n/mrp_operations.pot b/addons/mrp_operations/i18n/mrp_operations.pot
index eecf95b06d2..c420b5b780e 100644
--- a/addons/mrp_operations/i18n/mrp_operations.pot
+++ b/addons/mrp_operations/i18n/mrp_operations.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:07+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:07+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:55+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:55+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mrp_operations/i18n/vi.po b/addons/mrp_operations/i18n/vi.po
index e6ef6b5b467..dbbad98fc5c 100644
--- a/addons/mrp_operations/i18n/vi.po
+++ b/addons/mrp_operations/i18n/vi.po
@@ -1,20 +1,20 @@
 # Vietnamese translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-08-02 14:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 15:18+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:26+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
@@ -29,12 +29,12 @@ msgstr ""
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_canceloperation0
 msgid "Cancel the operation."
-msgstr ""
+msgstr "Hủy tác vụ"
 
 #. module: mrp_operations
 #: model:ir.model,name:mrp_operations.model_mrp_operations_operation_code
 msgid "mrp_operations.operation.code"
-msgstr ""
+msgstr "mrp_operations.operation.code"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -46,7 +46,7 @@ msgstr ""
 #: view:mrp.production.workcenter.line:0
 #: view:mrp.workorder:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_workorder0
@@ -56,7 +56,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "March"
-msgstr ""
+msgstr "Tháng Ba"
 
 #. module: mrp_operations
 #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_resource_planning
@@ -139,7 +139,7 @@ msgstr ""
 #: code:addons/mrp_operations/mrp_operations.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Lỗi!"
 
 #. module: mrp_operations
 #: selection:mrp.production.workcenter.line,state:0
@@ -246,7 +246,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "July"
-msgstr ""
+msgstr "Tháng Bảy"
 
 #. module: mrp_operations
 #: field:mrp_operations.operation.code,name:0
@@ -284,12 +284,12 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "September"
-msgstr ""
+msgstr "Tháng Chín"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "December"
-msgstr ""
+msgstr "Tháng Mười hai"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -395,7 +395,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "August"
-msgstr ""
+msgstr "Tháng Tám"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -405,7 +405,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "June"
-msgstr ""
+msgstr "Tháng Sáu"
 
 #. module: mrp_operations
 #: code:addons/mrp_operations/mrp_operations.py:0
@@ -437,7 +437,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "November"
-msgstr ""
+msgstr "Tháng Mười một"
 
 #. module: mrp_operations
 #: help:mrp.production.workcenter.line,delay:0
@@ -452,12 +452,12 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "October"
-msgstr ""
+msgstr "Tháng Mười"
 
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "January"
-msgstr ""
+msgstr "Tháng Một"
 
 #. module: mrp_operations
 #: model:process.node,note:mrp_operations.process_node_doneoperation0
@@ -620,7 +620,7 @@ msgstr ""
 #: view:mrp.workorder:0
 #: field:mrp.workorder,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Sản phẩm"
 
 #. module: mrp_operations
 #: view:mrp.workorder:0
@@ -678,7 +678,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "February"
-msgstr ""
+msgstr "Tháng Hai"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startcanceloperation0
@@ -693,7 +693,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "April"
-msgstr ""
+msgstr "Tháng Tư"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_startdoneoperation0
@@ -715,7 +715,7 @@ msgstr ""
 #. module: mrp_operations
 #: selection:mrp.workorder,month:0
 msgid "May"
-msgstr ""
+msgstr "Tháng Năm"
 
 #. module: mrp_operations
 #: model:process.transition,name:mrp_operations.process_transition_workstartoperation0
diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py
index 206dfabbc74..df5456baa4a 100644
--- a/addons/mrp_operations/mrp_operations.py
+++ b/addons/mrp_operations/mrp_operations.py
@@ -39,7 +39,7 @@ class stock_move(osv.osv):
         'move_dest_id_lines': fields.one2many('stock.move','move_dest_id', 'Children Moves')
     }
     
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
         default.update({
@@ -50,7 +50,7 @@ class stock_move(osv.osv):
 stock_move()
 
 class mrp_production_workcenter_line(osv.osv):
-    def _get_date_date(self, cr, uid, ids, field_name, arg, context):
+    def _get_date_date(self, cr, uid, ids, field_name, arg, context=None):
         """ Finds starting date.
         @return: Dictionary of values.
         """
@@ -62,11 +62,10 @@ class mrp_production_workcenter_line(osv.osv):
                 res[op.id]=False
         return res
 
-    def _get_date_end(self, cr, uid, ids, field_name, arg, context):
+    def _get_date_end(self, cr, uid, ids, field_name, arg, context=None):
         """ Finds ending date.
         @return: Dictionary of values.
         """
-
         ops = self.browse(cr, uid, ids, context=context)
         date_and_hours_by_cal = [(op.date_planned, op.hour, op.workcenter_id.calendar_id.id) for op in ops if op.date_planned]
 
@@ -143,7 +142,7 @@ class mrp_production_workcenter_line(osv.osv):
                 wf_service.trg_validate(uid, 'mrp.production', oper_obj.production_id.id, 'button_produce_done', cr)
         return
 
-    def write(self, cr, uid, ids, vals, context={}, update=True):
+    def write(self, cr, uid, ids, vals, context=None, update=True):
         result = super(mrp_production_workcenter_line, self).write(cr, uid, ids, vals, context=context)
         prod_obj = self.pool.get('mrp.production')
         if vals.get('date_planned', False) and update:
@@ -214,7 +213,7 @@ class mrp_production(osv.osv):
         'allow_reorder': fields.boolean('Free Serialisation', help="Check this to be able to move independently all production orders, without moving dependent ones."),
     }
 
-    def _production_date_end(self, cr, uid, ids, prop, unknow_none, context={}):
+    def _production_date_end(self, cr, uid, ids, prop, unknow_none, context=None):
         """ Calculates planned end date of production order.
         @return: Dictionary of values
         """
@@ -255,11 +254,13 @@ class mrp_production(osv.osv):
             wf_service.trg_validate(uid, 'mrp.production.workcenter.line', workcenter_line.id, 'button_cancel', cr)
         return super(mrp_production,self).action_cancel(cr,uid,ids)
 
-    def _compute_planned_workcenter(self, cr, uid, ids, context={}, mini=False):
+    def _compute_planned_workcenter(self, cr, uid, ids, context=None, mini=False):
         """ Computes planned and finished dates for work order.
         @return: Calculated date
         """
         dt_end = datetime.now()
+        if context is None:
+            context = {}
         for po in self.browse(cr, uid, ids, context=context):
             dt_end = datetime.strptime(po.date_planned, '%Y-%m-%d %H:%M:%S')
             if not po.date_start:
@@ -295,11 +296,11 @@ class mrp_production(osv.osv):
             })
         return dt_end
 
-    def _move_pass(self, cr, uid, ids, context={}):
+    def _move_pass(self, cr, uid, ids, context=None):
         """ Calculates start date for stock moves finding interval from resource calendar.
         @return: True 
         """
-        for po in self.browse(cr, uid, ids, context):
+        for po in self.browse(cr, uid, ids, context=context):
             if po.allow_reorder:
                 continue
             todo = po.move_lines
@@ -323,11 +324,11 @@ class mrp_production(osv.osv):
                             self.write(cr, uid, [l.production_id.id], {'date_start':dt.strftime('%Y-%m-%d %H:%M:%S')}, mini=True)
         return True
 
-    def _move_futur(self, cr, uid, ids, context={}):
+    def _move_futur(self, cr, uid, ids, context=None):
         """ Calculates start date for stock moves.
         @return: True 
         """
-        for po in self.browse(cr, uid, ids, context):
+        for po in self.browse(cr, uid, ids, context=context):
             if po.allow_reorder:
                 continue
             for line in po.move_created_ids:
@@ -343,7 +344,7 @@ class mrp_production(osv.osv):
                         break
 
 
-    def write(self, cr, uid, ids, vals, context={}, update=True, mini=True):
+    def write(self, cr, uid, ids, vals, context=None, update=True, mini=True):
         direction = {}
         if vals.get('date_start', False):
             for po in self.browse(cr, uid, ids, context=context):
@@ -392,7 +393,7 @@ class mrp_operations_operation(osv.osv):
         operation_ids = self.pool.get('mrp_operations.operation').search(cr, uid, [('production_id','=',ids[0])], context=context)
         return operation_ids
 
-    def _get_order_date(self, cr, uid, ids, field_name, arg, context):
+    def _get_order_date(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates planned date for an operation.
         @return: Dictionary of values
         """
@@ -481,7 +482,7 @@ class mrp_operations_operation(osv.osv):
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
-        oper_objs=self.browse(cr,uid,ids)[0]
+        oper_objs = self.browse(cr, uid, ids, context=context)[0]
         vals['production_id']=oper_objs.production_id.id
         vals['workcenter_id']=oper_objs.workcenter_id.id
 
@@ -500,11 +501,11 @@ class mrp_operations_operation(osv.osv):
     def create(self, cr, uid, vals, context=None):
         wf_service = netsvc.LocalService('workflow')
         code_ids=self.pool.get('mrp_operations.operation.code').search(cr,uid,[('id','=',vals['code_id'])])
-        code=self.pool.get('mrp_operations.operation.code').browse(cr,uid,code_ids)[0]
+        code=self.pool.get('mrp_operations.operation.code').browse(cr, uid, code_ids, context=context)[0]
         wc_op_id=self.pool.get('mrp.production.workcenter.line').search(cr,uid,[('workcenter_id','=',vals['workcenter_id']),('production_id','=',vals['production_id'])])
         if code.start_stop in ('start','done','pause','cancel','resume'):
             if not wc_op_id:
-                production_obj=self.pool.get('mrp.production').browse(cr,uid,vals['production_id'])
+                production_obj=self.pool.get('mrp.production').browse(cr, uid, vals['production_id'], context=context)
                 wc_op_id.append(self.pool.get('mrp.production.workcenter.line').create(cr,uid,{'production_id':vals['production_id'],'name':production_obj.product_id.name,'workcenter_id':vals['workcenter_id']}))
             if code.start_stop=='start':
                 self.pool.get('mrp.production.workcenter.line').action_start_working(cr,uid,wc_op_id)
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index 5f89375a7fc..24ac585bd71 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-06 22:10+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:02+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -36,6 +35,18 @@ msgid ""
 "* The 'Done' state is set when repairing is completed.            \n"
 "* The 'Cancelled' state is used when user cancel repair order."
 msgstr ""
+" *El estado 'Borrador' se utiliza cuando un usuario está introduciendo una "
+"nueva orden de reparación sin confirmar             \n"
+"*El estado 'Confirmado' se utiliza cuando un usuario cofnirma la orden de "
+"reparación.             \n"
+"*El estado 'Listo para reparar' se utiliza para iniciar la reparación, el "
+"usuario puede iniciar la reparación solo depués de la confirmación de la "
+"orden de reparación \n"
+"*El estado 'A facturar' se utiliza pra generar la factura antes o depués de "
+"la realización de la reparación.\n"
+"*El estado 'Realizado' se utiliza cuando la reapración ha sido terminada.\n"
+"*El estado 'Cancelado' se utiliza cuando un usuario cancela la orden de "
+"reparación."
 
 #. module: mrp_repair
 #: field:mrp.repair.line,move_id:0
diff --git a/addons/mrp_repair/i18n/it.po b/addons/mrp_repair/i18n/it.po
index 1a9174d4010..c24e287654e 100644
--- a/addons/mrp_repair/i18n/it.po
+++ b/addons/mrp_repair/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:15+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_repair/i18n/mrp_repair.pot b/addons/mrp_repair/i18n/mrp_repair.pot
index 0d026433f24..63228f611b4 100644
--- a/addons/mrp_repair/i18n/mrp_repair.pot
+++ b/addons/mrp_repair/i18n/mrp_repair.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:08+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:08+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:56+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:56+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/mrp_repair.py
index 53b10b6eab2..f2ffd87c095 100644
--- a/addons/mrp_repair/mrp_repair.py
+++ b/addons/mrp_repair/mrp_repair.py
@@ -30,7 +30,7 @@ class mrp_repair(osv.osv):
     _name = 'mrp.repair'
     _description = 'Repair Order'
 
-    def _amount_untaxed(self, cr, uid, ids, field_name, arg, context):
+    def _amount_untaxed(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates untaxed amount.
         @param self: The object pointer
         @param cr: The current row, from the database cursor,
@@ -44,7 +44,7 @@ class mrp_repair(osv.osv):
         res = {}
         cur_obj = self.pool.get('res.currency')
 
-        for repair in self.browse(cr, uid, ids):
+        for repair in self.browse(cr, uid, ids, context=context):
             res[repair.id] = 0.0
             for line in repair.operations:
                 res[repair.id] += line.price_subtotal
@@ -54,7 +54,7 @@ class mrp_repair(osv.osv):
             res[repair.id] = cur_obj.round(cr, uid, cur, res[repair.id])
         return res
 
-    def _amount_tax(self, cr, uid, ids, field_name, arg, context):
+    def _amount_tax(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates taxed amount.
         @param field_name: Name of field.
         @param arg: Argument
@@ -64,7 +64,7 @@ class mrp_repair(osv.osv):
         #return {}.fromkeys(ids, 0)
         cur_obj = self.pool.get('res.currency')
         tax_obj = self.pool.get('account.tax')
-        for repair in self.browse(cr, uid, ids):
+        for repair in self.browse(cr, uid, ids, context=context):
             val = 0.0
             cur = repair.pricelist_id.currency_id
             for line in repair.operations:
@@ -78,26 +78,26 @@ class mrp_repair(osv.osv):
             res[repair.id] = cur_obj.round(cr, uid, cur, val)
         return res
 
-    def _amount_total(self, cr, uid, ids, field_name, arg, context):
+    def _amount_total(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates total amount.
         @param field_name: Name of field.
         @param arg: Argument
         @return: Dictionary of values.
         """
         res = {}
-        untax = self._amount_untaxed(cr, uid, ids, field_name, arg, context)
-        tax = self._amount_tax(cr, uid, ids, field_name, arg, context)
+        untax = self._amount_untaxed(cr, uid, ids, field_name, arg, context=context)
+        tax = self._amount_tax(cr, uid, ids, field_name, arg, context=context)
         cur_obj = self.pool.get('res.currency')
         for id in ids:
-            repair = self.browse(cr, uid, [id])[0]
+            repair = self.browse(cr, uid, id, context=context)
             cur = repair.pricelist_id.currency_id
             res[id] = cur_obj.round(cr, uid, cur, untax.get(id, 0.0) + tax.get(id, 0.0))
         return res
     
-    def _get_default_address(self, cr, uid, ids, field_name, arg, context):
+    def _get_default_address(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         partner_obj = self.pool.get('res.partner')
-        for data in self.browse(cr, uid, ids):
+        for data in self.browse(cr, uid, ids, context=context):
             adr_id = False
             if data.partner_id:
                 adr_id = partner_obj.address_get(cr, uid, [data.partner_id.id], ['default'])['default']
@@ -335,7 +335,7 @@ class mrp_repair(osv.osv):
         @return: True
         """
         mrp_line_obj = self.pool.get('mrp.repair.line')
-        for repair in self.browse(cr, uid, ids):
+        for repair in self.browse(cr, uid, ids, context=context):
             mrp_line_obj.write(cr, uid, [l.id for l in repair.operations], {'state': 'cancel'})
         self.write(cr,uid,ids,{'state':'cancel'})
         return True
@@ -474,7 +474,7 @@ class mrp_repair(osv.osv):
         """ Writes repair order state to 'Ready' if invoice method is Before repair.
         @return: True
         """
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             val = {}
             if (order.invoice_method == 'b4repair'):
                 val['state'] = 'ready'
@@ -488,7 +488,7 @@ class mrp_repair(osv.osv):
         After repair else state is set to 'Ready'.
         @return: True
         """
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             val = {}
             val['repaired'] = True
             if (not order.invoiced and order.invoice_method=='after_repair'):
@@ -625,7 +625,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         default.update( {'invoice_line_id': False, 'move_id': False, 'invoiced': False, 'state': 'draft'})
         return super(mrp_repair_line, self).copy_data(cr, uid, id, default, context)
 
-    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates amount.
         @param field_name: Name of field.
         @param arg: Argument
@@ -633,7 +633,7 @@ class mrp_repair_line(osv.osv, ProductChangeMixin):
         """
         res = {}
         cur_obj=self.pool.get('res.currency')
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.to_invoice and line.price_unit * line.product_uom_qty or 0
             cur = line.repair_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
@@ -714,7 +714,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         default.update({'invoice_line_id': False, 'invoiced': False})
         return super(mrp_repair_fee, self).copy_data(cr, uid, id, default, context)
 
-    def _amount_line(self, cr, uid, ids, field_name, arg, context):
+    def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         """ Calculates amount.
         @param field_name: Name of field.
         @param arg: Argument
@@ -722,7 +722,7 @@ class mrp_repair_fee(osv.osv, ProductChangeMixin):
         """
         res = {}
         cur_obj = self.pool.get('res.currency')
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = line.to_invoice and line.price_unit * line.product_uom_qty or 0
             cur = line.repair_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index 658adef8e9e..e7ef69c2dcc 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -26,7 +26,7 @@ class repair_cancel(osv.osv_memory):
     _name = 'mrp.repair.cancel'
     _description = 'Cancel Repair'
 
-    def cancel_repair(self, cr, uid, ids, context):
+    def cancel_repair(self, cr, uid, ids, context=None):
         """ Cancels the repair
         @param self: The object pointer.
         @param cr: A database cursor
@@ -35,11 +35,13 @@ class repair_cancel(osv.osv_memory):
         @param context: A standard dictionary 
         @return:  
         """
+        if context is None:
+            context = {}
         record_id = context and context.get('active_id', False) or False
         assert record_id, _('Active ID is not Found')
         repair_order_obj = self.pool.get('mrp.repair')
         repair_line_obj = self.pool.get('mrp.repair.line')
-        repair_order = repair_order_obj.browse(cr, uid, record_id)
+        repair_order = repair_order_obj.browse(cr, uid, record_id, context=context)
         
         if repair_order.invoiced or repair_order.invoice_method == 'none':
             repair_order_obj.action_cancel(cr, uid, [record_id], context=context)            
@@ -56,6 +58,8 @@ class repair_cancel(osv.osv_memory):
         @param context: A standard dictionary 
         @return: New arch of view.
         """
+        if context is None:
+            context = {}
         res = super(repair_cancel, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         record_id = context and context.get('active_id', False) or False        
         active_model = context.get('active_model')
@@ -63,7 +67,7 @@ class repair_cancel(osv.osv_memory):
         if not record_id or (active_model and active_model != 'mrp.repair'):
             return res
         
-        repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id)
+        repair_order = self.pool.get('mrp.repair').browse(cr, uid, record_id, context=context)
         if not repair_order.invoiced:
             res['arch'] = """ <form string="Cancel Repair" colspan="4">
                             <group col="2" colspan="2">
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/make_invoice.py
index 971c7f97319..2cb6409348e 100644
--- a/addons/mrp_repair/wizard/make_invoice.py
+++ b/addons/mrp_repair/wizard/make_invoice.py
@@ -30,7 +30,7 @@ class make_invoice(osv.osv_memory):
 	   'group': fields.boolean('Group by partner invoice address'),
     }
 
-    def make_invoices(self, cr, uid, ids, context):
+    def make_invoices(self, cr, uid, ids, context=None):
         """ Generates invoice(s) of selected records.
         @param self: The object pointer.
         @param cr: A database cursor
@@ -39,7 +39,9 @@ class make_invoice(osv.osv_memory):
         @param context: A standard dictionary
         @return: Loads the view of new invoice(s).
         """
-        inv = self.browse(cr, uid, ids[0])
+        if context is None:
+            context = {}
+        inv = self.browse(cr, uid, ids[0], context=context)
         order_obj = self.pool.get('mrp.repair')
         newinv = order_obj.action_invoice_create(cr, uid, context['active_ids'],
                                                  group=inv.group,context=context)
diff --git a/addons/mrp_subproduct/i18n/mrp_subproduct.pot b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
index 016ce94f151..4d3ea5e6f2d 100644
--- a/addons/mrp_subproduct/i18n/mrp_subproduct.pot
+++ b/addons/mrp_subproduct/i18n/mrp_subproduct.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:08+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:08+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:56+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:56+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index e271e2bfb26..3229cdce33c 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -36,13 +36,13 @@ class mrp_subproduct(osv.osv):
         'subproduct_type': lambda *args: 'fixed'
     }
     
-    def onchange_product_id(self, cr, uid, ids, product_id,context={}):
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         """ Changes UoM if product_id changes.
         @param product_id: Changed product_id
         @return: Dictionary of changed values
         """
         if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, product_id)
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v = {'product_uom': prod.uom_id.id}
             return {'value': v}
         return {}
diff --git a/addons/multi_company/i18n/es.po b/addons/multi_company/i18n/es.po
index 22d82013c90..aecbafd140e 100644
--- a/addons/multi_company/i18n/es.po
+++ b/addons/multi_company/i18n/es.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-11-25 19:23+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:09+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:33+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.cash_journal_multi_in
 msgid "Cash Journal - (OpenERP IN)"
-msgstr ""
+msgstr "Diario de efectivo - (OpenERP IN)"
 
 #. module: multi_company
 #: model:res.company,overdue_msg:multi_company.res_company_odoo
@@ -65,7 +64,7 @@ msgstr ""
 #. module: multi_company
 #: model:account.journal,name:multi_company.check_journal_multi_in
 msgid "Checks Journal - (OpenERP IN)"
-msgstr ""
+msgstr "Diario de cheques - (OpenERP IN)"
 
 #. module: multi_company
 #: model:ir.ui.menu,name:multi_company.menu_custom_multicompany
@@ -75,17 +74,17 @@ msgstr "Multi-Compañías"
 #. module: multi_company
 #: model:account.journal,name:multi_company.refund_sales_journal_multi_us
 msgid "Sales Credit Note Journal - (OpenERP US)"
-msgstr ""
+msgstr "Diario de notas de crédito - (OpenERP US)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.expenses_journal_multi_us
 msgid "Expenses Journal - (OpenERP US)"
-msgstr ""
+msgstr "Diario de gastos - (OpenERP US)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.expenses_journal_multi_be
 msgid "Expenses Journal - (OpenERP BE)"
-msgstr ""
+msgstr "Diario de gastos - (OpenERP BE)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.sales_journal_multi_us
@@ -95,7 +94,7 @@ msgstr "Diario de ventas - (OpenERP US)"
 #. module: multi_company
 #: model:account.journal,name:multi_company.expenses_journal_multi_in
 msgid "Expenses Journal - (OpenERP IN)"
-msgstr ""
+msgstr "Diario de gastos - (OpenERP IN)"
 
 #. module: multi_company
 #: view:multi_company.default:0
@@ -111,12 +110,12 @@ msgstr "Multi compañía"
 #. module: multi_company
 #: model:account.journal,name:multi_company.sales_journal_multi_in
 msgid "Sales Journal - (OpenERP IN)"
-msgstr ""
+msgstr "Diario de ventas -  (OpenERP IN)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.check_journal_multi_be
 msgid "Checks Journal - (OpenERP BE)"
-msgstr ""
+msgstr "Diario de cheques -  (OpenERP BE)"
 
 #. module: multi_company
 #: view:multi_company.default:0
@@ -136,12 +135,12 @@ msgstr ""
 #. module: multi_company
 #: model:account.journal,name:multi_company.cash_journal_multi_us
 msgid "Cash Journal - (OpenERP US)"
-msgstr ""
+msgstr "Diario de efectivo -  (OpenERP US)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.bank_journal_multi_us
 msgid "Bank Journal - (OpenERP US)"
-msgstr ""
+msgstr "Diario de bancos -  (OpenERP US)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.refund_sales_journal_multi_in
@@ -151,17 +150,17 @@ msgstr ""
 #. module: multi_company
 #: model:account.journal,name:multi_company.cash_journal_multi_be
 msgid "Cash Journal - (OpenERP BE)"
-msgstr ""
+msgstr "Diario de efectivo -  (OpenERP BE)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.check_journal_multi_us
 msgid "Checks Journal - (OpenERP US)"
-msgstr ""
+msgstr "Diario de cheques -  (OpenERP US)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.sales_journal_multi_be
 msgid "Sales Journal - (OpenERP BE)"
-msgstr ""
+msgstr "Diario de ventas -  (OpenERP BE)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.refund_expenses_journal_multi_be
@@ -192,12 +191,12 @@ msgstr ""
 #. module: multi_company
 #: model:account.journal,name:multi_company.bank_journal_multi_in
 msgid "Bank Journal - (OpenERP IN)"
-msgstr ""
+msgstr "Diario de bancos -  (OpenERP IN)"
 
 #. module: multi_company
 #: model:account.journal,name:multi_company.bank_journal_multi_be
 msgid "Bank Journal - (OpenERP BE)"
-msgstr ""
+msgstr "Diario de bancos -  (OpenERP BE)"
 
 #. module: multi_company
 #: view:multi_company.default:0
diff --git a/addons/multi_company/i18n/multi_company.pot b/addons/multi_company/i18n/multi_company.pot
index ab9f386401d..f1b503638ab 100644
--- a/addons/multi_company/i18n/multi_company.pot
+++ b/addons/multi_company/i18n/multi_company.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:08+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:08+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:57+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/outlook/i18n/outlook.pot b/addons/outlook/i18n/outlook.pot
index 100ea1442e7..ce7d8528bdc 100644
--- a/addons/outlook/i18n/outlook.pot
+++ b/addons/outlook/i18n/outlook.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:09+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:09+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:57+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:57+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -37,6 +37,7 @@ msgstr ""
 
 #. module: outlook
 #: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+#: view:outlook.installer:0
 msgid "Outlook Plug-In"
 msgstr ""
 
@@ -73,6 +74,7 @@ msgstr ""
 #. module: outlook
 #: model:ir.actions.act_window,name:outlook.action_outlook_installer
 #: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+#: view:outlook.installer:0
 msgid "Outlook Plug-In Configuration"
 msgstr ""
 
@@ -81,6 +83,11 @@ msgstr ""
 msgid "Allows you to select an object that you’d like to add to your email and its attachments."
 msgstr ""
 
+#. module: outlook
+#: view:outlook.installer:0
+msgid "This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+
 #. module: outlook
 #: view:outlook.installer:0
 msgid "Skip"
diff --git a/addons/outlook/i18n/sl.po b/addons/outlook/i18n/sl.po
new file mode 100644
index 00000000000..3e90c7f0daf
--- /dev/null
+++ b/addons/outlook/i18n/sl.po
@@ -0,0 +1,118 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-15 12:59+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Vtičnik za Outlook"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Navodila za namestitev"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Nastavi"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+msgid "Outlook Plug-In"
+msgstr "Vtičnik za Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "naslov"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Vmesnik za Outlook"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Vtičnik za Outlook "
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.installer"
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr ""
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+msgid "Outlook Plug-In Configuration"
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you’d like to add to your email and its "
+"attachments."
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
diff --git a/addons/outlook/i18n/sv.po b/addons/outlook/i18n/sv.po
index 74a1d47161b..01283326066 100644
--- a/addons/outlook/i18n/sv.po
+++ b/addons/outlook/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-13 20:48+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2010-12-15 10:35+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: outlook
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 40f15e06c53..f3f5ece60d6 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -29,8 +29,8 @@ class outlook_installer(osv.osv_memory):
     _name = 'outlook.installer'
     _inherit = 'res.config.installer'
 
-    def default_get(self, cr, uid, fields, context={}):
-        data = super(outlook_installer, self).default_get(cr, uid, fields, context)
+    def default_get(self, cr, uid, fields, context=None):
+        data = super(outlook_installer, self).default_get(cr, uid, fields, context=context)
         data['doc_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_outlook.html'
         file = open(addons.get_module_resource('outlook','plugin','openerp-outlook-addin.exe'), 'r')
         data['plugin_file'] = base64.encodestring(file.read())
diff --git a/addons/pad/i18n/pad.pot b/addons/pad/i18n/pad.pot
index 8afdd13cf30..e4a8219317f 100644
--- a/addons/pad/i18n/pad.pot
+++ b/addons/pad/i18n/pad.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:09+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:09+0000\n"
+"POT-Creation-Date: 2010-12-15 15:05:58+0000\n"
+"PO-Revision-Date: 2010-12-15 15:05:58+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/pad/i18n/sl.po b/addons/pad/i18n/sl.po
new file mode 100644
index 00000000000..755b1051986
--- /dev/null
+++ b/addons/pad/i18n/sl.po
@@ -0,0 +1,62 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-15 12:58+0000\n"
+"Last-Translator: Simon Vidmar <Unknown>\n"
+"Language-Team: Slovenian <sl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#, python-format
+msgid "Ok"
+msgstr "V redu"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#, python-format
+msgid "Name"
+msgstr "Ime"
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Družbe"
+
+#. module: pad
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Napaka! Ne morete narediti rekurzivne povezave na podjetje"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr ""
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr ""
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#: view:res.company:0
+#, python-format
+msgid "Pad"
+msgstr ""
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr ""
diff --git a/addons/point_of_sale/account_bank_statement.py b/addons/point_of_sale/account_bank_statement.py
index 552687f7bdb..706cd50a84b 100644
--- a/addons/point_of_sale/account_bank_statement.py
+++ b/addons/point_of_sale/account_bank_statement.py
@@ -41,8 +41,6 @@ class account_cash_statement(osv.osv):
     _inherit = 'account.bank.statement'
 
     def _equal_balance(self, cr, uid, cash_id, context=None):
-        if context is None:
-            context = {}
         statement = self.browse(cr, uid, cash_id, context=context)
         if not statement.journal_id.check_dtls:
             return True
@@ -60,8 +58,6 @@ class account_cash_statement(osv.osv):
         return False
 
     def _get_cash_open_box_lines(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         res = super(account_cash_statement,self)._get_cash_open_box_lines(cr, uid, context)
         curr = [0.01, 0.02, 0.05, 0.10, 0.20, 0.50]
         for rs in curr:
@@ -74,8 +70,6 @@ class account_cash_statement(osv.osv):
         return res
 
     def _get_default_cash_close_box_lines(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         res = super(account_cash_statement,self)._get_default_cash_close_box_lines(cr, uid, context=context)
         curr = [0.01, 0.02, 0.05, 0.10, 0.20, 0.50]
         for rs in curr:
diff --git a/addons/point_of_sale/i18n/fr.po b/addons/point_of_sale/i18n/fr.po
index bdb90d21787..df45877a6cc 100644
--- a/addons/point_of_sale/i18n/fr.po
+++ b/addons/point_of_sale/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-11-30 18:14+0000\n"
+"PO-Revision-Date: 2010-12-15 04:59+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/it.po b/addons/point_of_sale/i18n/it.po
index ba2cd673c0b..bbeb61b5fcb 100644
--- a/addons/point_of_sale/i18n/it.po
+++ b/addons/point_of_sale/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-10-30 08:37+0000\n"
+"PO-Revision-Date: 2010-12-15 14:19+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 03bdd45ede8..51312468261 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:11+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:11+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:00+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:00+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/point_of_sale/i18n/pt.po b/addons/point_of_sale/i18n/pt.po
index 7b391edc54a..655e9930a46 100644
--- a/addons/point_of_sale/i18n/pt.po
+++ b/addons/point_of_sale/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-15 04:21+0000\n"
+"PO-Revision-Date: 2010-12-15 23:25+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/sv.po b/addons/point_of_sale/i18n/sv.po
index 144bcf5760a..95af53a017c 100644
--- a/addons/point_of_sale/i18n/sv.po
+++ b/addons/point_of_sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-12 20:51+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 15:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index b4b2ff9cb9f..fa2de26f4e8 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -96,14 +96,14 @@ class pos_order(osv.osv):
                 res[rec.id] = res[rec.id] + rec.amount_tax
         return res
 
-    def _get_date_payment2(self, cr, uid, ids, context, *a):
+    def _get_date_payment2(self, cr, uid, ids, context=None, *a):
         # Todo need to check this function
         """ Find payment Date
         @param field_names: Names of fields.
         @return: Dictionary of values """
         res = {}
         val = None
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             cr.execute("SELECT date_payment FROM pos_order WHERE id = %s", (order.id,))
             date_p = cr.fetchone()
             date_p = date_p and date_p[0] or None
@@ -878,7 +878,7 @@ class pos_order(osv.osv):
         self.write(cr, uid, ids, vals, context=context)
 
     def action_paid(self, cr, uid, ids, context=None):
-        if not context:
+        if context is None:
             context = {}
         if context.get('flag', False):
             self.create_picking(cr, uid, ids, context=None)
@@ -973,12 +973,12 @@ class pos_order_line(osv.osv):
                 res[line.id] = line.price_unit * line.qty
         return res
 
-    def _amount_line_all(self, cr, uid, ids, field_names, arg, context):
+    def _amount_line_all(self, cr, uid, ids, field_names, arg, context=None):
         res = dict([(i, {}) for i in ids])
         account_tax_obj = self.pool.get('account.tax')
 
         self.price_by_product_multi(cr, uid, ids)
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             for f in field_names:
                 if f == 'price_subtotal':
                     if line.discount != 0.0:
diff --git a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
index c7f2240d81f..330668548e4 100644
--- a/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
@@ -34,6 +34,8 @@ class all_closed_cashbox_of_the_day(osv.osv_memory):
              @param context: A standard dictionary
              @return : retrun report
         """
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
         return {
             'type': 'ir.actions.report.xml',
diff --git a/addons/point_of_sale/wizard/pos_discount.py b/addons/point_of_sale/wizard/pos_discount.py
index 03717f7701c..928fe396f0b 100644
--- a/addons/point_of_sale/wizard/pos_discount.py
+++ b/addons/point_of_sale/wizard/pos_discount.py
@@ -43,6 +43,8 @@ class pos_discount(osv.osv_memory):
          @param context: A standard dictionary
          @return: New arch of view with new columns.
         """
+        if context is None:
+            context = {}
         super(pos_discount, self).view_init(cr, uid, fields_list, context=context)
         record_id = context and context.get('active_id', False) or False
         order = self.pool.get('pos.order').browse(cr, uid, record_id, context=context)
diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py
index 2040c390efe..241f0a6e1d0 100644
--- a/addons/point_of_sale/wizard/pos_open_statement.py
+++ b/addons/point_of_sale/wizard/pos_open_statement.py
@@ -40,6 +40,8 @@ class pos_open_statement(osv.osv_memory):
         statement_obj = self.pool.get('account.bank.statement')
         sequence_obj = self.pool.get('ir.sequence')
         journal_obj = self.pool.get('account.journal')
+        if context is None:
+            context = {}
         company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
         cr.execute("SELECT DISTINCT journal_id FROM pos_journal_users "
                     "WHERE user_id = %s ORDER BY journal_id"% (uid, ))
diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py
index c7ae5d6eb27..fe3dd14db73 100644
--- a/addons/point_of_sale/wizard/pos_payment.py
+++ b/addons/point_of_sale/wizard/pos_payment.py
@@ -81,6 +81,8 @@ class pos_make_payment(osv.osv_memory):
         return res
 
     def view_init(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         super(pos_make_payment, self).view_init(cr, uid, fields_list, context=context)
         active_id = context and context.get('active_id', False) or False
         if active_id:
@@ -140,13 +142,15 @@ class pos_make_payment(osv.osv_memory):
         if the order is paid print invoice (if wanted) or ticket.
         """
         order_obj = self.pool.get('pos.order')
+        if context is None:
+            context = {}
         active_id = context and context.get('active_id', False)
         order = order_obj.browse(cr, uid, active_id, context=context)
         amount = order.amount_total - order.amount_paid
         data =  self.read(cr, uid, ids, context=context)[0]
         # Todo need to check ...
         if data['is_acc']:
-            line_id, price = order_obj.add_product(cr, uid, order.id, data['product_id'], -1.0, context)
+            line_id, price = order_obj.add_product(cr, uid, order.id, data['product_id'], -1.0, context=context)
             amount = order.amount_total - order.amount_paid - price
 
         if amount != 0.0:
@@ -155,28 +159,28 @@ class pos_make_payment(osv.osv_memory):
 
         if order_obj.test_paid(cr, uid, [active_id]):
             if data['partner_id'] and data['invoice_wanted']:
-                order_obj.action_invoice(cr, uid, [active_id], context)
-                order_obj.create_picking(cr, uid, [active_id], context)
+                order_obj.action_invoice(cr, uid, [active_id], context=context)
+                order_obj.create_picking(cr, uid, [active_id], context=context)
                 if context.get('return', False):
                     order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context)
                 else:
                     order_obj.write(cr, uid, [active_id],{'state':'paid'}, context=context)
-                return self.create_invoice(cr, uid, ids, context)
+                return self.create_invoice(cr, uid, ids, context=context)
             else:
                 context.update({'flag': True})
-                order_obj.action_paid(cr, uid, [active_id], context)
+                order_obj.action_paid(cr, uid, [active_id], context=context)
                 if context.get('return', False):
                     order_obj.write(cr, uid, [active_id], {'state':'done'}, context=context)
                 else:
                     order_obj.write(cr, uid, [active_id], {'state':'paid'}, context=context)
-                return self.print_report(cr, uid, ids, context)
+                return self.print_report(cr, uid, ids, context=context)
 
         if order.amount_paid > 0.0:
             context.update({'flag': True})
             # Todo need to check
-            order_obj.action_paid(cr, uid, [active_id], context)
+            order_obj.action_paid(cr, uid, [active_id], context=context)
             order_obj.write(cr, uid, [active_id], {'state': 'advance'}, context=context)
-            return self.print_report(cr, uid, ids, context)
+            return self.print_report(cr, uid, ids, context=context)
         return {}
 
 
@@ -184,6 +188,8 @@ class pos_make_payment(osv.osv_memory):
         """
           Create  a invoice
         """
+        if context is None:
+            context = {}
         active_ids = [context and context.get('active_id', False)]
         datas = {'ids': active_ids}
         return {
@@ -201,7 +207,7 @@ class pos_make_payment(osv.osv_memory):
          @param context: A standard dictionary
          @return : retrun report
         """
-        if not context:
+        if context is None:
             context = {}
         active_id = context.get('active_id', [])
         datas = {'ids' : [active_id]}
diff --git a/addons/point_of_sale/wizard/pos_receipt.py b/addons/point_of_sale/wizard/pos_receipt.py
index 39e38bdfa3c..71efee85b7c 100644
--- a/addons/point_of_sale/wizard/pos_receipt.py
+++ b/addons/point_of_sale/wizard/pos_receipt.py
@@ -46,6 +46,8 @@ class pos_receipt(osv.osv_memory):
         @param context: A standard dictionary
         @return : retrun report
         """
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
         return {
             'type': 'ir.actions.report.xml',
diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py
index c0e37d84ef3..810ef86ec7b 100644
--- a/addons/point_of_sale/wizard/pos_return.py
+++ b/addons/point_of_sale/wizard/pos_return.py
@@ -44,10 +44,10 @@ class pos_return(osv.osv_memory):
 
         res = super(pos_return, self).default_get(cr, uid, fields, context=context)
         order_obj = self.pool.get('pos.order')
-        active_ids = context.get('active_ids')
-        if not context:
+        if context is None:
             context={}
-        for order in order_obj.browse(cr, uid, active_ids):
+        active_ids = context.get('active_ids')
+        for order in order_obj.browse(cr, uid, active_ids, context=context):
             for line in order.lines:
                 if 'return%s'%(line.id) in fields:
                     res['return%s'%(line.id)] = line.qty
@@ -64,11 +64,11 @@ class pos_return(osv.osv_memory):
         """
         res = super(pos_return, self).view_init(cr, uid, fields_list, context=context)
         order_obj=self.pool.get('pos.order')
-        if not context:
+        if context is None:
             context={}
 
         active_ids=context.get('active_ids')
-        for order in order_obj.browse(cr, uid, active_ids):
+        for order in order_obj.browse(cr, uid, active_ids, context=context):
             for line in order.lines:
                 if 'return%s'%(line.id) not in self._columns:
                     self._columns['return%s'%(line.id)] = fields.float("Quantity")
@@ -89,7 +89,7 @@ class pos_return(osv.osv_memory):
 
         """
         result = super(pos_return, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar,submenu)
-        if not context:
+        if context is None:
             context={}
         active_model = context.get('active_model')
         if not active_model and active_model != 'pos.order':
@@ -101,7 +101,7 @@ class pos_return(osv.osv_memory):
                             <form string="Return lines">
                             <label string="Quantities you enter, match to products that will return to the stock." colspan="4"/>"""
             _line_fields = result['fields']
-            order=order_obj.browse(cr, uid, active_id)
+            order=order_obj.browse(cr, uid, active_id, context=context)
             for line in order.lines:
                 quantity=line.qty
                 _line_fields.update({
@@ -133,7 +133,7 @@ class pos_return(osv.osv_memory):
         return result
 
 
-    def  create_returns(self, cr, uid, data, context):
+    def  create_returns(self, cr, uid, data, context=None):
         """
              @param self: The object pointer.
              @param cr: A database cursor
@@ -143,10 +143,12 @@ class pos_return(osv.osv_memory):
              @return: Return the add product form again for adding more product
 
         """
+        if context is None:
+            context = {}
         current_rec = self.read(cr, uid, data[0], context=context)
         order_obj =self.pool.get('pos.order')
         line_obj = self.pool.get('pos.order.line')
-        pos_current = order_obj.browse(cr, uid, context.get('active_id'))
+        pos_current = order_obj.browse(cr, uid, context.get('active_id'), context=context)
         pos_line_ids = pos_current.lines
         if pos_line_ids:
             for pos_line in pos_line_ids:
@@ -171,7 +173,9 @@ class pos_return(osv.osv_memory):
             'context': context,
             'type': 'ir.actions.act_window',
         }
-    def create_returns2(self, cr, uid, ids, context):
+    def create_returns2(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         active_id = context.get('active_id', False)
         order_obj =self.pool.get('pos.order')
         line_obj = self.pool.get('pos.order.line')
@@ -188,7 +192,7 @@ class pos_return(osv.osv_memory):
 
             for order_id in order_obj.browse(cr, uid, [active_id], context=context):
                 prop_ids = property_obj.search(cr, uid,[('name', '=', 'property_stock_customer')])
-                val = property_obj.browse(cr, uid, prop_ids[0]).value_reference
+                val = property_obj.browse(cr, uid, prop_ids[0], context=context).value_reference
                 cr.execute("SELECT s.id FROM stock_location s, stock_warehouse w "
                             "WHERE w.lot_stock_id=s.id AND w.id=%s ", 
                             (order_id.shop_id.warehouse_id.id,))
@@ -257,7 +261,7 @@ pos_return()
 
 class add_product(osv.osv_memory):
     _inherit = 'pos.add.product'
-    def select_product(self, cr, uid, ids, context):
+    def select_product(self, cr, uid, ids, context=None):
         """
              To get the product and quantity and add in order .
              @param self: The object pointer.
@@ -266,6 +270,8 @@ class add_product(osv.osv_memory):
              @param context: A standard dictionary
              @return : Retrun the add product form again for adding more product
         """
+        if context is None:
+            context = {}
 
         active_id=context.get('active_id', False)
         data =  self.read(cr, uid, ids)
@@ -293,7 +299,7 @@ class add_product(osv.osv_memory):
                 location_id=res and res[0] or None
                 stock_dest_id = val.id
 
-                prod_id=prod_obj.browse(cr, uid, prod)
+                prod_id=prod_obj.browse(cr, uid, prod, context=context)
                 new_picking=picking_obj.create(cr, uid, {
                                 'name':'%s (Added)' %order_id.name,
                                 'move_lines':[],
@@ -329,7 +335,8 @@ class add_product(osv.osv_memory):
             'type': 'ir.actions.act_window',
         }
 
-    def close_action(self, cr, uid, ids, context):
+    def close_action(self, cr, uid, ids, context=None):
+        if context is None: context = {}
         active_ids=context.get('active_ids', False)
         order_obj = self.pool.get('pos.order')
         lines_obj = self.pool.get('pos.order.line')
diff --git a/addons/point_of_sale/wizard/pos_sales_user.py b/addons/point_of_sale/wizard/pos_sales_user.py
index 7698bb9798f..e17aff8bdca 100644
--- a/addons/point_of_sale/wizard/pos_sales_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user.py
@@ -33,7 +33,7 @@ class pos_sale_user(osv.osv_memory):
         'user_id': fields.many2many('res.users', 'sale_user_rel', 'user_id', 'uid', 'Salesman'),
     }
 
-    def print_report(self, cr, uid, ids, context={}):
+    def print_report(self, cr, uid, ids, context=None):
         """
          To get the date and print the report
          @param self: The object pointer.
@@ -42,9 +42,11 @@ class pos_sale_user(osv.osv_memory):
          @param context: A standard dictionary
          @return : return report
         """
+        if context is None:
+            context = {}
 
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context)
+        res = self.read(cr, uid, ids, ['date_start', 'date_end', 'user_id'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         return {
diff --git a/addons/point_of_sale/wizard/pos_sales_user_current_user.py b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
index ac603ad36d1..100154ac734 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_current_user.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_current_user.py
@@ -30,7 +30,7 @@ class pos_sales_user_today_current_user(osv.osv_memory):
     _columns = {
     }
 
-    def print_report(self, cr, uid, ids, context={}):
+    def print_report(self, cr, uid, ids, context=None):
         """
          To get the date and print the report
          @param self: The object pointer.
@@ -39,9 +39,11 @@ class pos_sales_user_today_current_user(osv.osv_memory):
          @param context: A standard dictionary
          @return : retrun report
         """
+        if context is None:
+            context = {}
 
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, [], context)
+        res = self.read(cr, uid, ids, [], context=context)
         res = res and res[0] or {}
         datas['form'] = res
 
diff --git a/addons/point_of_sale/wizard/pos_sales_user_today.py b/addons/point_of_sale/wizard/pos_sales_user_today.py
index 7025275c3cd..33c9dc8f3fc 100644
--- a/addons/point_of_sale/wizard/pos_sales_user_today.py
+++ b/addons/point_of_sale/wizard/pos_sales_user_today.py
@@ -31,7 +31,7 @@ class pos_sales_user_today(osv.osv_memory):
        'user_id': fields.many2many('res.users', 'sale_user_rel_today', 'user_id', 'uid', 'Salesman'),
     }
 
-    def print_report(self, cr, uid, ids, context={}):
+    def print_report(self, cr, uid, ids, context=None):
         """
          To get the date and print the report
          @param self: The object pointer.
@@ -40,9 +40,11 @@ class pos_sales_user_today(osv.osv_memory):
          @param context: A standard dictionary
          @return : retrun report
         """
+        if context is None:
+            context = {}
 
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['user_id'], context)
+        res = self.read(cr, uid, ids, ['user_id'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
 
diff --git a/addons/point_of_sale/wizard/pos_scan_product.py b/addons/point_of_sale/wizard/pos_scan_product.py
index debfe3b7737..49cd32eba4d 100644
--- a/addons/point_of_sale/wizard/pos_scan_product.py
+++ b/addons/point_of_sale/wizard/pos_scan_product.py
@@ -28,7 +28,7 @@ class pos_scan_product(osv.osv_memory):
     _columns = {
         'gencod': fields.char('Barcode',size=13,required= True)
     }
-    def scan(self, cr, uid, ids, context):
+    def scan(self, cr, uid, ids, context=None):
         """ 
          To get the gencod and scan product         
          @param self: The object pointer.
@@ -37,7 +37,8 @@ class pos_scan_product(osv.osv_memory):
          @param context: A standard dictionary 
          @return : retrun gencod
         """
-                
+        if context is None:
+            context = {}
         data=self.read(cr, uid, ids)[0]
         record_id = context and context.get('active_id',False)
         result =self. pool.get('pos.order.line')._scan_product(cr, uid, data['gencod'], 1, record_id)
diff --git a/addons/process/i18n/gl.po b/addons/process/i18n/gl.po
index c5e3ff626cc..a0d95d12e69 100644
--- a/addons/process/i18n/gl.po
+++ b/addons/process/i18n/gl.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-11-02 16:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 06:01+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
diff --git a/addons/process/i18n/process.pot b/addons/process/i18n/process.pot
index ece3bb3987f..8a310dcbe0d 100644
--- a/addons/process/i18n/process.pot
+++ b/addons/process/i18n/process.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:12+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:12+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:01+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/process/i18n/vi.po b/addons/process/i18n/vi.po
index 832b4dcd1bf..b84a710f78e 100644
--- a/addons/process/i18n/vi.po
+++ b/addons/process/i18n/vi.po
@@ -1,20 +1,20 @@
 # Vietnamese translation for openobject-addons
 # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# Phong Nguyen <phong.nguyen_thanh@yahoo.com>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-08-02 15:04+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-12-15 15:26+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:06+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
@@ -45,7 +45,7 @@ msgstr ""
 #: view:process.node:0
 #: view:process.process:0
 msgid "Group By..."
-msgstr ""
+msgstr "Nhóm theo..."
 
 #. module: process
 #: selection:process.node,kind:0
@@ -115,7 +115,7 @@ msgstr ""
 #: view:process.process:0
 #: field:process.process,model_id:0
 msgid "Object"
-msgstr ""
+msgstr "Đối tượng"
 
 #. module: process
 #: field:process.transition,source_node_id:0
diff --git a/addons/process/process.py b/addons/process/process.py
index 3fd368c0117..72c8bce10b4 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -52,7 +52,7 @@ class process_process(osv.osv):
         'active' : lambda *a: True,
     }
 
-    def search_by_model(self, cr, uid, res_model, context):
+    def search_by_model(self, cr, uid, res_model, context=None):
         pool = pooler.get_pool(cr.dbname)
         model_ids = (res_model or None) and pool.get('ir.model').search(cr, uid, [('model', '=', res_model)])
 
@@ -62,7 +62,7 @@ class process_process(osv.osv):
         # search all processes
         res = pool.get('process.process').search(cr, uid, domain)
         if res:
-            res = pool.get('process.process').browse(cr, uid, res, context)
+            res = pool.get('process.process').browse(cr, uid, res, context=context)
             for process in res:
                 result.append((process.id, process.name))
             return result
@@ -70,18 +70,18 @@ class process_process(osv.osv):
         # else search process nodes
         res = pool.get('process.node').search(cr, uid, domain)
         if res:
-            res = pool.get('process.node').browse(cr, uid, res, context)
+            res = pool.get('process.node').browse(cr, uid, res, context=context)
             for node in res:
                 if (node.process_id.id, node.process_id.name) not in result:
                     result.append((node.process_id.id, node.process_id.name))
 
         return result
 
-    def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
+    def graph_get(self, cr, uid, id, res_model, res_id, scale, context=None):
 
         pool = pooler.get_pool(cr.dbname)
 
-        process = pool.get('process.process').browse(cr, uid, [id], context)[0]
+        process = pool.get('process.process').browse(cr, uid, id, context=context)
 
         name = process.name
         resource = None
@@ -95,13 +95,13 @@ class process_process(osv.osv):
             states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {}))
 
         if res_id:
-            current_object = pool.get(res_model).browse(cr, uid, [res_id], context)[0]
-            current_user = pool.get('res.users').browse(cr, uid, [uid], context)[0]
+            current_object = pool.get(res_model).browse(cr, uid, res_id, context=context)
+            current_user = pool.get('res.users').browse(cr, uid, uid, context=context)
             expr_context = Env(current_object, current_user)
             resource = current_object.name
             if 'state' in current_object:
                 state = states.get(current_object.state, 'N/A')
-            perm = pool.get(res_model).perm_read(cr, uid, [res_id], context)[0]
+            perm = pool.get(res_model).perm_read(cr, uid, [res_id], context=context)[0]
 
         notes = process.note or "N/A"
         nodes = {}
@@ -188,7 +188,7 @@ class process_process(osv.osv):
 
             nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model}
 
-            refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0]
+            refobj = pool.get(ref_model).browse(cr, uid, ref_id, context=context)
             fields = pool.get(ref_model).fields_get(cr, uid, context=context)
 
             # check for directory_id from inherited from document module
@@ -245,15 +245,15 @@ class process_process(osv.osv):
 
         return dict(name=name, resource=resource, state=state, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
 
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         """ Deep copy the entire process.
         """
 
         if not default:
             default = {}
-
+        
         pool = pooler.get_pool(cr.dbname)
-        process = pool.get('process.process').browse(cr, uid, [id], context)[0]
+        process = pool.get('process.process').browse(cr, uid, id, context=context)
 
         nodes = {}
         transitions = {}
@@ -309,14 +309,14 @@ class process_node(osv.osv):
         'flow_start': lambda *args: False,
     }
 
-    def copy_data(self, cr, uid, id, default=None, context={}):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
         default.update({
             'transition_in': [],
             'transition_out': []
         })
-        return super(process_node, self).copy_data(cr, uid, id, default, context)
+        return super(process_node, self).copy_data(cr, uid, id, default, context=context)
 
 process_node()
 
@@ -366,11 +366,11 @@ class process_transition_action(osv.osv):
         'state': lambda *args: 'dummy',
     }
 
-    def copy_data(self, cr, uid, id, default=None, context={}):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-
-        state = self.pool.get('process.transition.action').browse(cr, uid, [id], context)[0].state
+            
+        state = self.pool.get('process.transition.action').browse(cr, uid, id, context=context).state
         if state:
             default['state'] = state
 
diff --git a/addons/procurement/i18n/es.po b/addons/procurement/i18n/es.po
index 47742615d15..15381f00bbd 100644
--- a/addons/procurement/i18n/es.po
+++ b/addons/procurement/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:50+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:12+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
@@ -315,6 +314,7 @@ msgstr "Cantidad"
 #, python-format
 msgid "Not enough stock and no minimum orderpoint rule defined."
 msgstr ""
+"No hay suficiente stock y no se ha definido una regla de stock mínimo."
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
diff --git a/addons/procurement/i18n/procurement.pot b/addons/procurement/i18n/procurement.pot
index d8bb1dc4543..4c302d5bb74 100644
--- a/addons/procurement/i18n/procurement.pot
+++ b/addons/procurement/i18n/procurement.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:13+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:13+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:02+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:02+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/procurement/i18n/sv.po b/addons/procurement/i18n/sv.po
index 4d190d62215..314bab7a98c 100644
--- a/addons/procurement/i18n/sv.po
+++ b/addons/procurement/i18n/sv.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po
index d7b653eb25a..674e3d072da 100644
--- a/addons/procurement/i18n/zh_CN.po
+++ b/addons/procurement/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 17:50+0000\n"
-"Last-Translator: Roger Zeng <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 23:53+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: procurement
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 23cf0a18ff5..ca590d8fa4e 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -70,7 +70,7 @@ class StockMove(osv.osv):
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
         default['procurements'] = []
-        return super(StockMove, self).copy(cr, uid, id, default, context)
+        return super(StockMove, self).copy(cr, uid, id, default, context=context)
 
 StockMove()
 
@@ -128,7 +128,7 @@ class procurement_order(osv.osv):
     }
 
     def unlink(self, cr, uid, ids, context=None):
-        procurements = self.read(cr, uid, ids, ['state'])
+        procurements = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for s in procurements:
             if s['state'] in ['draft','cancel']:
@@ -139,13 +139,13 @@ class procurement_order(osv.osv):
                         s['state'])
         return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
 
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         """ Finds UoM and UoS of changed product.
         @param product_id: Changed id of product.
         @return: Dictionary of values.
         """
         if product_id:
-            w = self.pool.get('product.product').browse(cr, uid, product_id, context)
+            w = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v = {
                 'product_uom': w.uom_id.id,
                 'product_uos': w.uos_id and w.uos_id.id or w.uom_id.id
@@ -159,11 +159,11 @@ class procurement_order(osv.osv):
         """
         return all(procurement.product_id.type in ('product', 'consu') for procurement in self.browse(cr, uid, ids))
 
-    def check_move_cancel(self, cr, uid, ids, context={}):
+    def check_move_cancel(self, cr, uid, ids, context=None):
         """ Checks if move is cancelled or not.
         @return: True or False.
         """
-        return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids))
+        return all(procurement.move_id.state == 'cancel' for procurement in self.browse(cr, uid, ids, context=context))
 
     def check_move_done(self, cr, uid, ids, context=None):
         """ Checks if move is done or not.
@@ -176,7 +176,7 @@ class procurement_order(osv.osv):
     # This method may be overrided by objects that override procurement.order
     # for computing their own purpose
     #
-    def _quantity_compute_get(self, cr, uid, proc, context={}):
+    def _quantity_compute_get(self, cr, uid, proc, context=None):
         """ Finds sold quantity of product.
         @param proc: Current procurement.
         @return: Quantity or False.
@@ -186,7 +186,7 @@ class procurement_order(osv.osv):
                 return proc.move_id.product_uos_qty
         return False
 
-    def _uom_compute_get(self, cr, uid, proc, context={}):
+    def _uom_compute_get(self, cr, uid, proc, context=None):
         """ Finds UoS if product is Stockable Product.
         @param proc: Current procurement.
         @return: UoS or False.
@@ -200,12 +200,12 @@ class procurement_order(osv.osv):
     # Return the quantity of product shipped/produced/served, which may be
     # different from the planned quantity
     #
-    def quantity_get(self, cr, uid, id, context={}):
+    def quantity_get(self, cr, uid, id, context=None):
         """ Finds quantity of product used in procurement.
         @return: Quantity of product.
         """
-        proc = self.browse(cr, uid, id, context)
-        result = self._quantity_compute_get(cr, uid, proc, context)
+        proc = self.browse(cr, uid, id, context=context)
+        result = self._quantity_compute_get(cr, uid, proc, context=context)
         if not result:
             result = proc.product_qty
         return result
@@ -214,13 +214,13 @@ class procurement_order(osv.osv):
         """ Finds UoM of product used in procurement.
         @return: UoM of product.
         """
-        proc = self.browse(cr, uid, id, context)
-        result = self._uom_compute_get(cr, uid, proc, context)
+        proc = self.browse(cr, uid, id, context=context)
+        result = self._uom_compute_get(cr, uid, proc, context=context)
         if not result:
             result = proc.product_uom.id
         return result
 
-    def check_waiting(self, cr, uid, ids, context=[]):
+    def check_waiting(self, cr, uid, ids, context=None):
         """ Checks state of move.
         @return: True or False
         """
@@ -229,17 +229,17 @@ class procurement_order(osv.osv):
                 return True
         return False
 
-    def check_produce_service(self, cr, uid, procurement, context=[]):
+    def check_produce_service(self, cr, uid, procurement, context=None):
         return False
 
-    def check_produce_product(self, cr, uid, procurement, context=[]):
+    def check_produce_product(self, cr, uid, procurement, context=None):
         """ Finds BoM of a product if not found writes exception message.
         @param procurement: Current procurement.
         @return: True or False.
         """
         return True
 
-    def check_make_to_stock(self, cr, uid, ids, context={}):
+    def check_make_to_stock(self, cr, uid, ids, context=None):
         """ Checks product type.
         @return: True or False
         """
@@ -251,13 +251,13 @@ class procurement_order(osv.osv):
                 ok = ok and self._check_make_to_stock_product(cr, uid, procurement, context)
         return ok
 
-    def check_produce(self, cr, uid, ids, context={}):
+    def check_produce(self, cr, uid, ids, context=None):
         """ Checks product type.
         @return: True or Product Id.
         """
         res = True
-        user = self.pool.get('res.users').browse(cr, uid, uid)
-        for procurement in self.browse(cr, uid, ids):
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.product_id.product_tmpl_id.supply_method <> 'produce':
                 partner_list = sorted([(partner_id.sequence, partner_id) for partner_id in  procurement.product_id.seller_ids if partner_id])
                 if partner_list:
@@ -308,12 +308,12 @@ class procurement_order(osv.osv):
                 return True
         return False
 
-    def action_confirm(self, cr, uid, ids, context={}):
+    def action_confirm(self, cr, uid, ids, context=None):
         """ Confirms procurement and writes exception message if any.
         @return: True
         """
         move_obj = self.pool.get('stock.move')
-        for procurement in self.browse(cr, uid, ids):
+        for procurement in self.browse(cr, uid, ids, context=context):
             if procurement.product_qty <= 0.00:
                 raise osv.except_osv(_('Data Insufficient !'),
                     _('Please check the Quantity in Procurement Order(s), it should not be less than 1!'))
@@ -339,7 +339,7 @@ class procurement_order(osv.osv):
         self.write(cr, uid, ids, {'state': 'confirmed', 'message': ''})
         return True
 
-    def action_move_assigned(self, cr, uid, ids, context={}):
+    def action_move_assigned(self, cr, uid, ids, context=None):
         """ Changes procurement state to Running and writes message.
         @return: True
         """
@@ -347,14 +347,14 @@ class procurement_order(osv.osv):
                 'message': _('from stock: products assigned.')})
         return True
 
-    def _check_make_to_stock_service(self, cr, uid, procurement, context={}):
+    def _check_make_to_stock_service(self, cr, uid, procurement, context=None):
         """
            This method may be overrided by objects that override procurement.order
            for computing their own purpose
         @return: True"""
         return True
 
-    def _check_make_to_stock_product(self, cr, uid, procurement, context={}):
+    def _check_make_to_stock_product(self, cr, uid, procurement, context=None):
         """ Checks procurement move state.
         @param procurement: Current procurement.
         @return: True or move id.
@@ -374,22 +374,22 @@ class procurement_order(osv.osv):
                     self.log(cr, uid, procurement.id, message)
         return ok
 
-    def action_produce_assign_service(self, cr, uid, ids, context={}):
+    def action_produce_assign_service(self, cr, uid, ids, context=None):
         """ Changes procurement state to Running.
         @return: True
         """
-        for procurement in self.browse(cr, uid, ids):
+        for procurement in self.browse(cr, uid, ids, context=context):
             self.write(cr, uid, [procurement.id], {'state': 'running'})
         return True
 
-    def action_produce_assign_product(self, cr, uid, ids, context={}):
+    def action_produce_assign_product(self, cr, uid, ids, context=None):
         """ This is action which call from workflow to assign production order to procurements
         @return: True
         """
         return 0
 
 
-    def action_po_assign(self, cr, uid, ids, context={}):
+    def action_po_assign(self, cr, uid, ids, context=None):
         """ This is action which call from workflow to assign purchase order to procurements
         @return: True
         """
@@ -459,8 +459,6 @@ class procurement_order(osv.osv):
         ''' Runs through scheduler.
         @param use_new_cursor: False or the dbname
         '''
-        if not context:
-            context={}
         self._procure_confirm(cr, uid, use_new_cursor=use_new_cursor, context=context)
         self._procure_orderpoint_confirm(cr, uid, automatic=automatic,\
                 use_new_cursor=use_new_cursor, context=context)
@@ -518,39 +516,38 @@ class stock_warehouse_orderpoint(osv.osv):
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.warehouse.orderpoint', context=c)
     }
     _sql_constraints = [
-        ('qty_multiple_check', 'CHECK( qty_multiple > 0 )',
-                _('Qty Multiple must be greater than zero.')),
+        ('qty_multiple_check', 'CHECK( qty_multiple > 0 )', 'Qty Multiple must be greater than zero.'),
     ]
 
-    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context={}):
+    def onchange_warehouse_id(self, cr, uid, ids, warehouse_id, context=None):
         """ Finds location id for changed warehouse.
         @param warehouse_id: Changed id of warehouse.
         @return: Dictionary of values.
         """
         if warehouse_id:
-            w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context)
+            w = self.pool.get('stock.warehouse').browse(cr, uid, warehouse_id, context=context)
             v = {'location_id': w.lot_stock_id.id}
             return {'value': v}
         return {}
 
-    def onchange_product_id(self, cr, uid, ids, product_id, context={}):
+    def onchange_product_id(self, cr, uid, ids, product_id, context=None):
         """ Finds UoM for changed product.
         @param product_id: Changed id of product.
         @return: Dictionary of values.
         """
         if product_id:
-            prod = self.pool.get('product.product').browse(cr,uid,product_id)
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             v = {'product_uom': prod.uom_id.id}
             return {'value': v}
         return {}
-
-    def copy(self, cr, uid, id, default=None,context={}):
+    
+    def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
         default.update({
             'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.orderpoint') or '',
         })
-        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
-
+        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
+    
 stock_warehouse_orderpoint()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index b3d3c3bb98d..9c83499f0a5 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -43,7 +43,7 @@ class procurement_order(osv.osv):
         @param context: A standard dictionary for contextual values
         @return:  Dictionary of values        
         '''
-        if not context:
+        if context is None:
             context = {}
 
         try:
@@ -69,13 +69,13 @@ class procurement_order(osv.osv):
             while True:
                 cr.execute("select id from procurement_order where state='confirmed' and procure_method='make_to_order' order by priority,date_planned limit 500 offset %s", (offset,))
                 ids = map(lambda x: x[0], cr.fetchall())
-                for proc in procurement_obj.browse(cr, uid, ids):
+                for proc in procurement_obj.browse(cr, uid, ids, context=context):
                     if maxdate >= proc.date_planned:
                         wf_service.trg_validate(uid, 'procurement.order', proc.id, 'button_check', cr)
                     else:
                         offset += 1
                         report_later += 1
-                for proc in procurement_obj.browse(cr, uid, ids):
+                for proc in procurement_obj.browse(cr, uid, ids, context=context):
                     if proc.state == 'exception':
                         report.append('PROC %d: on order - %3.2f %-5s - %s' % \
                                 (proc.id, proc.product_qty, proc.product_uom.name,
@@ -98,7 +98,7 @@ class procurement_order(osv.osv):
                     else:
                         report_later += 1
                     report_total += 1
-                for proc in procurement_obj.browse(cr, uid, report_ids):
+                for proc in procurement_obj.browse(cr, uid, report_ids, context=context):
                     if proc.state == 'exception':
                         report.append('PROC %d: from stock - %3.2f %-5s - %s' % \
                                 (proc.id, proc.product_qty, proc.product_uom.name,
@@ -148,7 +148,7 @@ class procurement_order(osv.osv):
         @param context: A standard dictionary for contextual values
         @return:  Dictionary of values
         """
-        if not context:
+        if context is None:
             context = {}
         product_obj = self.pool.get('product.product')
         proc_obj = self.pool.get('procurement.order')
@@ -200,7 +200,7 @@ class procurement_order(osv.osv):
         @return:  Dictionary of values
         """        
         '''
-        if not context:
+        if context is None:
             context = {}
         if use_new_cursor:
             cr = pooler.get_db(use_new_cursor).cursor()
diff --git a/addons/procurement/wizard/make_procurement_product.py b/addons/procurement/wizard/make_procurement_product.py
index 292cf7faf72..0f5acf2f5c8 100644
--- a/addons/procurement/wizard/make_procurement_product.py
+++ b/addons/procurement/wizard/make_procurement_product.py
@@ -62,14 +62,14 @@ class make_procurement(osv.osv_memory):
         @param context: A standard dictionary
         @return: A dictionary which loads Procurement form view.
         """
-        user = self.pool.get('res.users').browse(cr, uid, uid, context).login
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context).login
         wh_obj = self.pool.get('stock.warehouse')
         procurement_obj = self.pool.get('procurement.order')
         wf_service = netsvc.LocalService("workflow")
         data_obj = self.pool.get('ir.model.data')
 
-        for proc in self.browse(cr, uid, ids):
-            wh = wh_obj.browse(cr, uid, proc.warehouse_id.id, context)
+        for proc in self.browse(cr, uid, ids, context=context):
+            wh = wh_obj.browse(cr, uid, proc.warehouse_id.id, context=context)
             procure_id = procurement_obj.create(cr, uid, {
                 'name':'INT: '+str(user),
                 'date_planned': proc.date_planned,
@@ -109,6 +109,8 @@ class make_procurement(osv.osv_memory):
         @param context: A standard dictionary
         @return: A dictionary which of fields with values.
         """
+        if context is None:
+            context = {}
         record_id = context and context.get('active_id', False) or False
 
         res = super(make_procurement, self).default_get(cr, uid, fields, context=context)
diff --git a/addons/procurement/wizard/mrp_procurement.py b/addons/procurement/wizard/mrp_procurement.py
index 40977cf0b1a..7fa28adf5fe 100644
--- a/addons/procurement/wizard/mrp_procurement.py
+++ b/addons/procurement/wizard/mrp_procurement.py
@@ -26,7 +26,7 @@ class procurement_compute(osv.osv_memory):
     _name = 'procurement.order.compute'
     _description = 'Compute Procurement'
 
-    def _procure_calculation_procure(self, cr, uid, ids, context):
+    def _procure_calculation_procure(self, cr, uid, ids, context=None):
         try:
             proc_obj = self.pool.get('procurement.order')
             proc_obj._procure_confirm(cr, uid, use_new_cursor=cr.dbname, context=context)
@@ -34,7 +34,7 @@ class procurement_compute(osv.osv_memory):
             pass
         return {}
 
-    def procure_calculation(self, cr, uid, ids, context):
+    def procure_calculation(self, cr, uid, ids, context=None):
         """
          @param self: The object pointer.
          @param cr: A database cursor
diff --git a/addons/procurement/wizard/orderpoint_procurement.py b/addons/procurement/wizard/orderpoint_procurement.py
index cec7d13554d..d94e6753231 100644
--- a/addons/procurement/wizard/orderpoint_procurement.py
+++ b/addons/procurement/wizard/orderpoint_procurement.py
@@ -39,7 +39,7 @@ class procurement_compute(osv.osv_memory):
             'automatic': False,
     }
 
-    def _procure_calculation_orderpoint(self, cr, uid, ids, context):
+    def _procure_calculation_orderpoint(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer.
         @param cr: A database cursor
@@ -48,12 +48,12 @@ class procurement_compute(osv.osv_memory):
         @param context: A standard dictionary
         """
         proc_obj = self.pool.get('procurement.order')
-        for proc in self.browse(cr, uid, ids):
+        for proc in self.browse(cr, uid, ids, context=context):
             proc_obj._procure_orderpoint_confirm(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname, context=context)
 
         return {}
 
-    def procure_calculation(self, cr, uid, ids, context):
+    def procure_calculation(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer.
         @param cr: A database cursor
diff --git a/addons/procurement/wizard/schedulers_all.py b/addons/procurement/wizard/schedulers_all.py
index 11ecb9d2bf2..5fae2760edf 100644
--- a/addons/procurement/wizard/schedulers_all.py
+++ b/addons/procurement/wizard/schedulers_all.py
@@ -35,7 +35,7 @@ class procurement_compute_all(osv.osv_memory):
          'automatic': lambda *a: False,
     }
 
-    def _procure_calculation_all(self, cr, uid, ids, context):
+    def _procure_calculation_all(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer.
         @param cr: A database cursor
@@ -44,12 +44,12 @@ class procurement_compute_all(osv.osv_memory):
         @param context: A standard dictionary
         """
         proc_obj = self.pool.get('procurement.order')
-        for proc in self.browse(cr, uid, ids):
+        for proc in self.browse(cr, uid, ids, context=context):
             proc_obj.run_scheduler(cr, uid, automatic=proc.automatic, use_new_cursor=cr.dbname,\
                     context=context)
         return {}
 
-    def procure_calculation(self, cr, uid, ids, context):
+    def procure_calculation(self, cr, uid, ids, context=None):
         """
         @param self: The object pointer.
         @param cr: A database cursor
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index a7f2673bcad..6f9e7040935 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-09 07:57+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:18+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -1270,6 +1269,10 @@ msgid ""
 "be converted within each other. For example, in the unit of measure category "
 "\"Time\", you will have the following UoM: Hours, Days."
 msgstr ""
+"Cree y gestione las unidades de medida y categorías  que queira utilizar en "
+"su sistema. Si varias uniddades de miedida están en la misma categoría, se "
+"pueden convertir entre ellas. P.ej, en la categría de la unidad de medida "
+"\"Tiempo\", tendrá las siguienes UdM: Horas, Días."
 
 #. module: product
 #: view:product.product:0
@@ -1389,6 +1392,8 @@ msgid ""
 "Conversion from Product UoM m to Default UoM PCE is not possible as they "
 "both belong to different Category!."
 msgstr ""
+"¡La conversión de la UdM m a la UdM PCE no es posible ya que ambas "
+"pertenecen a categorías diferentes!"
 
 #. module: product
 #: field:product.pricelist.version,date_start:0
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index 4590337bd79..a9f336bd8f6 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-09-09 07:17+0000\n"
+"PO-Revision-Date: 2010-12-15 05:08+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index feded8cab55..0583959553b 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:15+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:15+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:04+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:04+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index e2dd68d5445..4001fdacab6 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-10-30 13:57+0000\n"
+"PO-Revision-Date: 2010-12-15 06:12+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 9c1ee9f429a..a279efc7e38 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index ea3e341f2c5..a5acec73d3b 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 23:59+0000\n"
-"Last-Translator: Phong Nguyen <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 23:51+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 24db07ae639..49fc25db051 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-11-19 09:39+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-16 01:20+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:19+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -58,17 +58,17 @@ msgstr "供应商的最低订购量"
 #. module: product
 #: model:product.uom,name:product.uom_day
 msgid "Day"
-msgstr ""
+msgstr "日"
 
 #. module: product
 #: view:product.product:0
 msgid "UoM"
-msgstr ""
+msgstr "计量单位"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc2_product_template
 msgid "Basic+ PC (assembly on order)"
-msgstr ""
+msgstr "基本配置 PC 组装订单"
 
 #. module: product
 #: field:product.product,incoming_qty:0
@@ -134,7 +134,7 @@ msgstr "规则名称"
 #: field:product.product,code:0
 #: field:product.product,default_code:0
 msgid "Reference"
-msgstr ""
+msgstr "引用"
 
 #. module: product
 #: constraint:product.category:0
@@ -479,7 +479,7 @@ msgstr "销售&采购"
 #. module: product
 #: model:product.uom.categ,name:product.uom_categ_wtime
 msgid "Working Time"
-msgstr ""
+msgstr "工作时间"
 
 #. module: product
 #: help:product.product,active:0
@@ -619,7 +619,7 @@ msgstr ""
 #. module: product
 #: field:product.supplierinfo,name:0
 msgid "Supplier"
-msgstr ""
+msgstr "供应商"
 
 #. module: product
 #: model:product.template,name:product.product_product_sidepanel0_product_template
@@ -767,7 +767,7 @@ msgstr "厨房设计项目"
 #. module: product
 #: model:product.uom,name:product.uom_hour
 msgid "Hour"
-msgstr ""
+msgstr "时"
 
 #. module: product
 #: selection:product.template,state:0
@@ -980,7 +980,7 @@ msgstr "价格表明细"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "大于引用的计量单位"
 
 #. module: product
 #: model:ir.module.module,shortdesc:product.module_meta_information
@@ -990,12 +990,12 @@ msgstr "产品列表&价格表"
 #. module: product
 #: view:product.product:0
 msgid "To Sell"
-msgstr ""
+msgstr "待销售的"
 
 #. module: product
 #: model:product.category,name:product.product_category_services0
 msgid "Marketable Services"
-msgstr ""
+msgstr "市场化服务"
 
 #. module: product
 #: field:product.pricelist.item,price_surcharge:0
@@ -1031,7 +1031,7 @@ msgstr "名称"
 #. module: product
 #: view:product.product:0
 msgid "Stockable"
-msgstr ""
+msgstr "可库存"
 
 #. module: product
 #: model:product.template,name:product.product_product_woodlintelm0_product_template
@@ -1041,12 +1041,12 @@ msgstr ""
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "kg"
-msgstr ""
+msgstr "kg"
 
 #. module: product
 #: model:product.uom,name:product.product_uom_meter
 msgid "m"
-msgstr ""
+msgstr "m"
 
 #. module: product
 #: selection:product.template,state:0
@@ -1056,7 +1056,7 @@ msgstr "作废"
 #. module: product
 #: model:product.uom,name:product.product_uom_km
 msgid "km"
-msgstr ""
+msgstr "km"
 
 #. module: product
 #: help:product.template,cost_method:0
@@ -1105,17 +1105,17 @@ msgstr "产品的相关字段"
 #. module: product
 #: view:product.product:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "计量单位"
 
 #. module: product
 #: field:product.template,procure_method:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "获得方式"
 
 #. module: product
 #: report:product.pricelist:0
 msgid "Printing Date"
-msgstr ""
+msgstr "打印日期"
 
 #. module: product
 #: field:product.template,uos_id:0
@@ -1177,7 +1177,7 @@ msgstr "垫板尺寸"
 #: code:addons/product/product.py:0
 #, python-format
 msgid " (copy)"
-msgstr ""
+msgstr " (复件)"
 
 #. module: product
 #: field:product.template,seller_ids:0
@@ -1187,7 +1187,7 @@ msgstr "业务伙伴列表"
 #. module: product
 #: sql_constraint:res.users:0
 msgid "You can not have two users with the same login !"
-msgstr ""
+msgstr "两个用户不能使用相同的用户名！"
 
 #. module: product
 #: help:product.template,sale_delay:0
@@ -1216,7 +1216,7 @@ msgstr "第二计量单位"
 #: code:addons/product/product.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "错误！"
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1361,7 +1361,7 @@ msgstr "当前库存"
 #. module: product
 #: model:product.uom,name:product.product_uom_cm
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 #. module: product
 #: model:ir.model,name:product.model_product_uom
@@ -1387,7 +1387,7 @@ msgstr "舍入精度"
 #. module: product
 #: view:product.uom:0
 msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "计量单位属性"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf1_product_template
@@ -1412,7 +1412,7 @@ msgstr "空包装的重量"
 #. module: product
 #: selection:product.uom,uom_type:0
 msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "小于引用的计量单位"
 
 #. module: product
 #: field:product.price.type,active:0
@@ -1468,7 +1468,7 @@ msgstr "所有库存操作的默认计量单位"
 #. module: product
 #: model:product.category,name:product.product_category_misc0
 msgid "Misc"
-msgstr ""
+msgstr "其他"
 
 #. module: product
 #: model:product.template,name:product.product_product_pc4_product_template
@@ -1503,17 +1503,17 @@ msgstr "公共价格表"
 #. module: product
 #: model:product.category,name:product.product_category_marketableproduct0
 msgid "Marketable Products"
-msgstr ""
+msgstr "可销售产品"
 
 #. module: product
 #: field:product.supplierinfo,product_code:0
 msgid "Supplier Product Code"
-msgstr ""
+msgstr "供应商产品代码"
 
 #. module: product
 #: view:product.product:0
 msgid "Default UOM"
-msgstr ""
+msgstr "默认计量单位"
 
 #. module: product
 #: selection:product.ul,type:0
@@ -1583,7 +1583,7 @@ msgstr ""
 #. module: product
 #: field:product.template,uom_id:0
 msgid "Default Unit Of Measure"
-msgstr ""
+msgstr "默认计量单位"
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1593,7 +1593,7 @@ msgstr "ATX中型塔式机箱"
 #. module: product
 #: field:product.packaging,ean:0
 msgid "EAN"
-msgstr ""
+msgstr "条码"
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -1704,7 +1704,7 @@ msgstr "价格表类型"
 #. module: product
 #: model:product.category,name:product.product_category_otherproducts0
 msgid "Other Products"
-msgstr ""
+msgstr "其他商品"
 
 #. module: product
 #: view:product.product:0
@@ -1714,7 +1714,7 @@ msgstr ""
 #. module: product
 #: field:product.template,sale_ok:0
 msgid "Can be Sold"
-msgstr ""
+msgstr "可以卖出"
 
 #. module: product
 #: field:product.template,produce_delay:0
@@ -1734,7 +1734,7 @@ msgstr "基于"
 #. module: product
 #: model:product.category,name:product.product_category_rawmaterial0
 msgid "Raw Materials"
-msgstr ""
+msgstr "原材料"
 
 #. module: product
 #: help:product.product,virtual_available:0
@@ -1752,7 +1752,7 @@ msgstr "价格表名称"
 #. module: product
 #: help:product.supplierinfo,product_uom:0
 msgid "Supplier Product UoM."
-msgstr ""
+msgstr "供应商产品计量单位"
 
 #. module: product
 #: model:ir.model,name:product.model_product_pricelist_version
@@ -1779,7 +1779,7 @@ msgstr "希捷 7200.8 120GB 硬盘"
 #. module: product
 #: model:product.template,name:product.product_product_employee0_product_template
 msgid "Employee"
-msgstr ""
+msgstr "雇员"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelfofcm0_product_template
@@ -1795,7 +1795,7 @@ msgstr "产品类型"
 #. module: product
 #: report:product.pricelist:0
 msgid "Price List Name"
-msgstr ""
+msgstr "价格表名称"
 
 #. module: product
 #: field:product.supplierinfo,delay:0
@@ -1925,12 +1925,12 @@ msgstr "重量"
 #. module: product
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "错误！您不能创建循环的关联成员。"
 
 #. module: product
 #: model:product.template,name:product.product_product_hotelexpenses0_product_template
 msgid "Hotel Expenses"
-msgstr ""
+msgstr "住宿花费"
 
 #. module: product
 #: help:product.uom,factor_inv:0
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 7d9aaa834f9..e2c4f6735b2 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -36,7 +36,7 @@ class price_type(osv.osv):
         When a field is a price, you can use it in pricelists to base
         sale and purchase prices based on some fields of the product.
     """
-    def _price_field_get(self, cr, uid, context={}):
+    def _price_field_get(self, cr, uid, context=None):
         mf = self.pool.get('ir.model.fields')
         ids = mf.search(cr, uid, [('model','in', (('product.product'),('product.template'))), ('ttype','=','float')], context=context)
         res = []
@@ -81,7 +81,7 @@ product_pricelist_type()
 
 
 class product_pricelist(osv.osv):
-    def _pricelist_type_get(self, cr, uid, context={}):
+    def _pricelist_type_get(self, cr, uid, context=None):
         pricelist_type_obj = self.pool.get('product.pricelist.type')
         pricelist_type_ids = pricelist_type_obj.search(cr, uid, [], order='name')
         pricelist_types = pricelist_type_obj.read(cr, uid, pricelist_type_ids, ['key','name'], context=context)
@@ -104,11 +104,11 @@ class product_pricelist(osv.osv):
         'company_id': fields.many2one('res.company', 'Company'),
     }
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         result= []
         if not all(ids):
             return result
-        for pl in self.browse(cr, uid, ids, context):
+        for pl in self.browse(cr, uid, ids, context=context):
             name = pl.name + ' ('+ pl.currency_id.name + ')'
             result.append((pl.id,name))
         return result
@@ -307,7 +307,8 @@ class product_pricelist(osv.osv):
         '''
         price = False
         item_id = 0
-        context = context or {}
+        if context is None:
+            context = {}
         currency_obj = self.pool.get('res.currency')
         product_obj = self.pool.get('product.product')
         supplierinfo_obj = self.pool.get('product.supplierinfo')
@@ -464,13 +465,13 @@ class product_pricelist_version(osv.osv):
     }
 
     # We desactivate duplicated pricelists, so that dates do not overlap
-    def copy(self, cr, uid, id, default=None,context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         if not default: default= {}
         default['active'] = False
         return super(product_pricelist_version, self).copy(cr, uid, id, default, context)
 
-    def _check_date(self, cursor, user, ids):
-        for pricelist_version in self.browse(cursor, user, ids):
+    def _check_date(self, cursor, user, ids, context=None):
+        for pricelist_version in self.browse(cursor, user, ids, context=context):
             if not pricelist_version.active:
                 continue
             where = []
@@ -499,7 +500,7 @@ class product_pricelist_version(osv.osv):
 product_pricelist_version()
 
 class product_pricelist_item(osv.osv):
-    def _price_field_get(self, cr, uid, context={}):
+    def _price_field_get(self, cr, uid, context=None):
         pt = self.pool.get('product.price.type')
         ids = pt.search(cr, uid, [], context=context)
         result = []
@@ -520,8 +521,8 @@ class product_pricelist_item(osv.osv):
         'price_discount': lambda *a: 0,
     }
 
-    def _check_recursion(self, cr, uid, ids):
-        for obj_list in self.browse(cr, uid, ids):
+    def _check_recursion(self, cr, uid, ids, context=None):
+        for obj_list in self.browse(cr, uid, ids, context=context):
             if obj_list.base == -1:
                 main_pricelist = obj_list.price_version_id.pricelist_id.id
                 other_pricelist = obj_list.base_pricelist_id.id
@@ -562,7 +563,7 @@ class product_pricelist_item(osv.osv):
         (_check_recursion, 'Error ! You cannot assign the Main Pricelist as Other Pricelist in PriceList Item!', ['base_pricelist_id'])
     ]
 
-    def product_id_change(self, cr, uid, ids, product_id, context={}):
+    def product_id_change(self, cr, uid, ids, product_id, context=None):
         if not product_id:
             return {}
         prod = self.pool.get('product.product').read(cr, uid, [product_id], ['code','name'])
diff --git a/addons/product/product.py b/addons/product/product.py
index 2b99f48a062..62ce31be9d6 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -77,16 +77,16 @@ class product_uom(osv.osv):
     def _compute_factor_inv(self, factor):
         return factor and round(1.0 / factor, 6) or 0.0
 
-    def _factor_inv(self, cursor, user, ids, name, arg, context):
+    def _factor_inv(self, cursor, user, ids, name, arg, context=None):
         res = {}
         for uom in self.browse(cursor, user, ids, context=context):
             res[uom.id] = self._compute_factor_inv(uom.factor)
         return res
 
-    def _factor_inv_write(self, cursor, user, id, name, value, arg, context):
+    def _factor_inv_write(self, cursor, user, id, name, value, arg, context=None):
         return self.write(cursor, user, id, {'factor': self._compute_factor_inv(value)}, context=context)
 
-    def create(self, cr, uid, data, context={}):
+    def create(self, cr, uid, data, context=None):
         if 'factor_inv' in data:
             if data['factor_inv'] <> 1:
                 data['factor'] = self._compute_factor_inv(data['factor_inv'])
@@ -188,7 +188,7 @@ class product_category(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
-        reads = self.read(cr, uid, ids, ['name','parent_id'], context)
+        reads = self.read(cr, uid, ids, ['name','parent_id'], context=context)
         res = []
         for record in reads:
             name = record['name']
@@ -197,8 +197,8 @@ class product_category(osv.osv):
             res.append((record['id'], name))
         return res
 
-    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context):
-        res = self.name_get(cr, uid, ids, context)
+    def _name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
+        res = self.name_get(cr, uid, ids, context=context)
         return dict(res)
 
     _name = "product.category"
@@ -218,7 +218,7 @@ class product_category(osv.osv):
     }
 
     _order = "sequence"
-    def _check_recursion(self, cr, uid, ids):
+    def _check_recursion(self, cr, uid, ids, context=None):
         level = 100
         while len(ids):
             cr.execute('select distinct parent_id from product_category where id IN %s',(tuple(ids),))
@@ -243,9 +243,9 @@ product_category()
 class product_template(osv.osv):
     _name = "product.template"
     _description = "Product Template"
-    def _calc_seller(self, cr, uid, ids, fields, arg, context={}):
+    def _calc_seller(self, cr, uid, ids, fields, arg, context=None):
         result = {}
-        for product in self.browse(cr, uid, ids, context):
+        for product in self.browse(cr, uid, ids, context=context):
             for field in fields:
                 result[product.id] = {field:False}
             result[product.id]['seller_delay'] = 1
@@ -308,7 +308,9 @@ class product_template(osv.osv):
         res = cr.fetchone()
         return res and res[0] or False
 
-    def _default_category(self, cr, uid, context={}):
+    def _default_category(self, cr, uid, context=None):
+        if context is None:
+            context = {}
         if 'categ_id' in context and context['categ_id']:
             return context['categ_id']
         md = self.pool.get('ir.model.data')
@@ -340,14 +342,14 @@ class product_template(osv.osv):
         'type' : lambda *a: 'consu',
     }
 
-    def _check_uom(self, cursor, user, ids):
-        for product in self.browse(cursor, user, ids):
+    def _check_uom(self, cursor, user, ids, context=None):
+        for product in self.browse(cursor, user, ids, context=context):
             if product.uom_id.category_id.id <> product.uom_po_id.category_id.id:
                 return False
         return True
 
-    def _check_uos(self, cursor, user, ids):
-        for product in self.browse(cursor, user, ids):
+    def _check_uos(self, cursor, user, ids, context=None):
+        for product in self.browse(cursor, user, ids, context=context):
             if product.uos_id \
                     and product.uos_id.category_id.id \
                     == product.uom_id.category_id.id:
@@ -359,7 +361,9 @@ class product_template(osv.osv):
         (_check_uom, 'Error: The default UOM and the purchase UOM must be in the same category.', ['uom_id']),
     ]
 
-    def name_get(self, cr, user, ids, context={}):
+    def name_get(self, cr, user, ids, context=None):
+        if context is None:
+            context = {}
         if 'partner_id' in context:
             pass
         return super(product_template, self).name_get(cr, user, ids, context)
@@ -367,14 +371,18 @@ class product_template(osv.osv):
 product_template()
 
 class product_product(osv.osv):
-    def view_header_get(self, cr, uid, view_id, view_type, context):
+    def view_header_get(self, cr, uid, view_id, view_type, context=None):
+        if context is None:
+            context = {}
         res = super(product_product, self).view_header_get(cr, uid, view_id, view_type, context)
         if (context.get('categ_id', False)):
-            return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context).name
+            return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context=context).name
         return res
 
-    def _product_price(self, cr, uid, ids, name, arg, context={}):
+    def _product_price(self, cr, uid, ids, name, arg, context=None):
         res = {}
+        if context is None:
+            context = {}
         quantity = context.get('quantity') or 1.0
         pricelist = context.get('pricelist', False)
         if pricelist:
@@ -389,7 +397,7 @@ class product_product(osv.osv):
         return res
 
     def _get_product_available_func(states, what):
-        def _product_available(self, cr, uid, ids, name, arg, context={}):
+        def _product_available(self, cr, uid, ids, name, arg, context=None):
             return {}.fromkeys(ids, 0.0)
         return _product_available
 
@@ -413,23 +421,27 @@ class product_product(osv.osv):
             res[product.id] =  (res[product.id] or 0.0) * (product.price_margin or 1.0) + product.price_extra
         return res
 
-    def _get_partner_code_name(self, cr, uid, ids, product, partner_id, context={}):
+    def _get_partner_code_name(self, cr, uid, ids, product, partner_id, context=None):
         for supinfo in product.seller_ids:
             if supinfo.name.id == partner_id:
                 return {'code': supinfo.product_code or product.default_code, 'name': supinfo.product_name or product.name, 'variants': ''}
         res = {'code': product.default_code, 'name': product.name, 'variants': product.variants}
         return res
 
-    def _product_code(self, cr, uid, ids, name, arg, context={}):
+    def _product_code(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for p in self.browse(cr, uid, ids, context):
-            res[p.id] = self._get_partner_code_name(cr, uid, [], p, context.get('partner_id', None), context)['code']
+        if context is None:
+            context = {}
+        for p in self.browse(cr, uid, ids, context=context):
+            res[p.id] = self._get_partner_code_name(cr, uid, [], p, context.get('partner_id', None), context=context)['code']
         return res
 
-    def _product_partner_ref(self, cr, uid, ids, name, arg, context={}):
+    def _product_partner_ref(self, cr, uid, ids, name, arg, context=None):
         res = {}
-        for p in self.browse(cr, uid, ids, context):
-            data = self._get_partner_code_name(cr, uid, [], p, context.get('partner_id', None), context)
+        if context is None:
+            context = {}
+        for p in self.browse(cr, uid, ids, context=context):
+            data = self._get_partner_code_name(cr, uid, [], p, context.get('partner_id', None), context=context)
             if not data['variants']:
                 data['variants'] = p.variants
             if not data['code']:
@@ -479,8 +491,8 @@ class product_product(osv.osv):
                 return {'value': {'uom_po_id': uom_id}}
         return False
 
-    def _check_ean_key(self, cr, uid, ids):
-        for product in self.browse(cr, uid, ids):
+    def _check_ean_key(self, cr, uid, ids, context=None):
+        for product in self.browse(cr, uid, ids, context=context):
             res = check_ean(product.ean13)
         return res
 
@@ -518,14 +530,12 @@ class product_product(osv.osv):
                               }
                     result.append(_name_get(mydict))
             else:
-                result.append(_name_get(self.read(cr, user, product.id, ['variants','name','default_code'], context)))
+                result.append(_name_get(self.read(cr, user, product.id, ['variants','name','default_code'], context=context)))
         return result
 
     def name_search(self, cr, user, name='', args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]
-        if not context:
-            context={}
         if name:
             ids = self.search(cr, user, [('default_code',operator,name)]+ args, limit=limit, context=context)
             if not len(ids):
@@ -540,7 +550,7 @@ class product_product(osv.osv):
                    ids = self.search(cr, user, [('default_code','ilike',res.group(2))]+ args, limit=limit, context=context)
         else:
             ids = self.search(cr, user, args, limit=limit, context=context)
-        result = self.name_get(cr, user, ids, context)
+        result = self.name_get(cr, user, ids, context=context)
         return result
 
     #
@@ -576,7 +586,7 @@ class product_product(osv.osv):
         return res
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if not context:
+        if context is None:
             context={}
 
         product = self.read(cr, uid, id, ['name'], context=context)
@@ -630,24 +640,24 @@ class product_packaging(osv.osv):
     }
 
 
-    def _check_ean_key(self, cr, uid, ids):
-        for pack in self.browse(cr, uid, ids):
+    def _check_ean_key(self, cr, uid, ids, context=None):
+        for pack in self.browse(cr, uid, ids, context=context):
             res = check_ean(pack.ean)
         return res
 
     _constraints = [(_check_ean_key, 'Error: Invalid ean code', ['ean'])]
 
-    def name_get(self, cr, uid, ids, context={}):
+    def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
         res = []
-        for pckg in self.browse(cr, uid, ids,context=context):
+        for pckg in self.browse(cr, uid, ids, context=context):
             p_name = pckg.ean and '[' + pckg.ean + '] ' or ''
             p_name += pckg.ul.name
             res.append((pckg.id,p_name))
         return res
 
-    def _get_1st_ul(self, cr, uid, context={}):
+    def _get_1st_ul(self, cr, uid, context=None):
         cr.execute('select id from product_ul order by id asc limit 1')
         res = cr.fetchone()
         return (res and res[0]) or False
@@ -672,10 +682,10 @@ product_packaging()
 class product_supplierinfo(osv.osv):
     _name = "product.supplierinfo"
     _description = "Information about a product supplier"
-    def _calc_qty(self, cr, uid, ids, fields, arg, context={}):
+    def _calc_qty(self, cr, uid, ids, fields, arg, context=None):
         result = {}
         product_uom_pool = self.pool.get('product.uom')
-        for supplier_info in self.browse(cr, uid, ids, context):
+        for supplier_info in self.browse(cr, uid, ids, context=context):
             for field in fields:
                 result[supplier_info.id] = {field:False}
             if supplier_info.product_uom.id:
@@ -709,8 +719,8 @@ class product_supplierinfo(osv.osv):
         'delay': lambda *a: 1,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'product.supplierinfo', context=c)
     }
-    def _check_uom(self, cr, uid, ids):
-        for supplier_info in self.browse(cr, uid, ids):
+    def _check_uom(self, cr, uid, ids, context=None):
+        for supplier_info in self.browse(cr, uid, ids, context=context):
             if supplier_info.product_uom and supplier_info.product_uom.category_id.id <> supplier_info.product_id.uom_id.category_id.id:
                 return False
         return True
@@ -725,8 +735,6 @@ class product_supplierinfo(osv.osv):
         @param product_id: Id of product.
         @param product_qty: specify quantity to purchase.
         """
-        if not context:
-            context = {}
         if type(supplier_ids) in (int,long,):
             supplier_ids = [supplier_ids]
         res = {}
@@ -734,7 +742,7 @@ class product_supplierinfo(osv.osv):
         partner_pool = self.pool.get('res.partner')
         pricelist_pool = self.pool.get('product.pricelist')
         currency_pool = self.pool.get('res.currency')
-        currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+        currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
         for supplier in partner_pool.browse(cr, uid, supplier_ids, context=context):
             # Compute price from standard price of product
             price = product_pool.price_get(cr, uid, [product_id], 'standard_price')[product_id]
@@ -776,8 +784,8 @@ pricelist_partnerinfo()
 
 class res_users(osv.osv):
     _inherit = 'res.users'
-    def _get_group(self, cr, uid, context):
-        result = super(res_users, self)._get_group(cr, uid, context)
+    def _get_group(self, cr, uid, context=None):
+        result = super(res_users, self)._get_group(cr, uid, context=context)
         dataobj = self.pool.get('ir.model.data')
         try:
             dummy,group_id = dataobj.get_object_reference(cr, 1, 'product', 'group_product_manager')
diff --git a/addons/product/wizard/product_price.py b/addons/product/wizard/product_price.py
index 853935acf6e..5a5327a3f6d 100644
--- a/addons/product/wizard/product_price.py
+++ b/addons/product/wizard/product_price.py
@@ -48,8 +48,10 @@ class product_price_list(osv.osv_memory):
         To get the date and print the report
         @return : return report
         """
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
-        res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context)
+        res = self.read(cr, uid, ids, ['price_list','qty1', 'qty2','qty3','qty4','qty5'], context=context)
         res = res and res[0] or {}
         datas['form'] = res
         return {
diff --git a/addons/product_expiry/i18n/product_expiry.pot b/addons/product_expiry/i18n/product_expiry.pot
index 01f3f149d98..58e3de7a81b 100644
--- a/addons/product_expiry/i18n/product_expiry.pot
+++ b/addons/product_expiry/i18n/product_expiry.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:16+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product_expiry/i18n/sv.po b/addons/product_expiry/i18n/sv.po
index b041c2bf359..65cf2784d8c 100644
--- a/addons/product_expiry/i18n/sv.po
+++ b/addons/product_expiry/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-13 20:40+0000\n"
-"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n"
+"PO-Revision-Date: 2010-12-15 11:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_expiry/product_expiry.py b/addons/product_expiry/product_expiry.py
index fb53d9d0c03..4497ca71957 100644
--- a/addons/product_expiry/product_expiry.py
+++ b/addons/product_expiry/product_expiry.py
@@ -60,7 +60,8 @@ class stock_production_lot(osv.osv):
         for f in ('life_date', 'use_date', 'removal_date', 'alert_date'):
             if not getattr(obj, f):
                 towrite.append(f)
-        context = context or {}
+        if context is None:
+            context = {}
         context['product_id'] = obj.product_id.id
         self.write(cr, uid, [obj.id], self.default_get(cr, uid, towrite, context=context))
         return newid
diff --git a/addons/product_manufacturer/i18n/fr.po b/addons/product_manufacturer/i18n/fr.po
index 1ce7d55e855..7a37336096a 100644
--- a/addons/product_manufacturer/i18n/fr.po
+++ b/addons/product_manufacturer/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-03 23:34+0000\n"
+"PO-Revision-Date: 2010-12-15 21:16+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_manufacturer
@@ -58,7 +58,7 @@ msgstr "Valeur"
 #. module: product_manufacturer
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur : Code ean invalide"
 
 #. module: product_manufacturer
 #: view:product.product:0
diff --git a/addons/product_manufacturer/i18n/product_manufacturer.pot b/addons/product_manufacturer/i18n/product_manufacturer.pot
index 2a83dacebaf..cee80197e85 100644
--- a/addons/product_manufacturer/i18n/product_manufacturer.pot
+++ b/addons/product_manufacturer/i18n/product_manufacturer.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:16+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product_margin/i18n/product_margin.pot b/addons/product_margin/i18n/product_margin.pot
index 3ead68225d6..d15cd9aac98 100644
--- a/addons/product_margin/i18n/product_margin.pot
+++ b/addons/product_margin/i18n/product_margin.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:16+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:16+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:05+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:05+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product_margin/wizard/product_margin.py b/addons/product_margin/wizard/product_margin.py
index 811477571d4..c1430566abe 100644
--- a/addons/product_margin/wizard/product_margin.py
+++ b/addons/product_margin/wizard/product_margin.py
@@ -51,7 +51,7 @@ class product_margin(osv.osv_memory):
         """
         mod_obj = self.pool.get('ir.model.data')
         result = mod_obj._get_id(cr, uid, 'product', 'product_search_form_view')
-        id = mod_obj.read(cr, uid, result, ['res_id'])
+        id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
         cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.graph', 'graph'))
         view_res3 = cr.fetchone()[0]
         cr.execute('select id,name from ir_ui_view where name=%s and type=%s', ('product.margin.form.inherit', 'form'))
@@ -60,7 +60,7 @@ class product_margin(osv.osv_memory):
         view_res = cr.fetchone()[0]
 
         #get the current product.margin object to obtain the values from it
-        product_margin_obj = self.browse(cr,uid,ids)[0]
+        product_margin_obj = self.browse(cr, uid, ids, context=context)[0]
 
         return {
             'name': _('Product Margins'),
diff --git a/addons/product_visible_discount/i18n/product_visible_discount.pot b/addons/product_visible_discount/i18n/product_visible_discount.pot
index f09a3249a90..57a3d90d58c 100644
--- a/addons/product_visible_discount/i18n/product_visible_discount.pot
+++ b/addons/product_visible_discount/i18n/product_visible_discount.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:17+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:06+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py
index cab071c34f2..bf4c2dc24f0 100644
--- a/addons/product_visible_discount/product_visible_discount.py
+++ b/addons/product_visible_discount/product_visible_discount.py
@@ -105,8 +105,8 @@ sale_order_line()
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
 
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context={}):
-        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
+        res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context=context)
 
         def get_real_price(res_dict, product_id, qty, uom, pricelist):
             item_obj = self.pool.get('product.pricelist.item')
diff --git a/addons/profile_tools/i18n/profile_tools.pot b/addons/profile_tools/i18n/profile_tools.pot
index 694e5bdf410..75a935160c6 100644
--- a/addons/profile_tools/i18n/profile_tools.pot
+++ b/addons/profile_tools/i18n/profile_tools.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:17+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:17+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:06+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:06+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,11 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: profile_tools
-#: field:misc_tools.installer,idea:0
-msgid "Ideas Box"
-msgstr ""
-
 #. module: profile_tools
 #: help:misc_tools.installer,idea:0
 msgid "Promote ideas of the employees, votes and discussion on best ideas."
@@ -31,13 +26,8 @@ msgid "Allows you to give restricted access to your OpenERP documents to externa
 msgstr ""
 
 #. module: profile_tools
-#: help:misc_tools.installer,subscription:0
-msgid "Helps to generate automatically recurring documents."
-msgstr ""
-
-#. module: profile_tools
-#: field:misc_tools.installer,lunch:0
-msgid "Lunch"
+#: view:misc_tools.installer:0
+msgid "Here are applications that can help you improve your organization without being key in its management."
 msgstr ""
 
 #. module: profile_tools
@@ -46,8 +36,20 @@ msgid "Tools Configuration"
 msgstr ""
 
 #. module: profile_tools
-#: field:misc_tools.installer,config_logo:0
-msgid "Image"
+#: view:misc_tools.installer:0
+msgid "Configure Extra Tools"
+msgstr ""
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid "Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: profile_tools
@@ -56,8 +58,8 @@ msgid "title"
 msgstr ""
 
 #. module: profile_tools
-#: field:misc_tools.installer,subscription:0
-msgid "Recurring Documents"
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
 msgstr ""
 
 #. module: profile_tools
@@ -66,8 +68,28 @@ msgid "This module creates a tighter integration between a Pad instance of your
 msgstr ""
 
 #. module: profile_tools
-#: help:misc_tools.installer,survey:0
-msgid "Allows you to organize surveys."
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr ""
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "Extra Tools Configuration"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
 msgstr ""
 
 #. module: profile_tools
@@ -81,8 +103,18 @@ msgid "misc_tools.installer"
 msgstr ""
 
 #. module: profile_tools
-#: field:misc_tools.installer,pad:0
-msgid "Native pad integration"
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
 msgstr ""
 
 #. module: profile_tools
@@ -91,19 +123,7 @@ msgid "Web Share"
 msgstr ""
 
 #. module: profile_tools
-#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
-msgid "Miscellaneous Tools"
-msgstr ""
-
-#. module: profile_tools
-#: model:ir.module.module,description:profile_tools.module_meta_information
-msgid "Installs tools for lunch,survey,subscription and audittrail\n"
-"    module\n"
-"    "
-msgstr ""
-
-#. module: profile_tools
-#: field:misc_tools.installer,progress:0
-msgid "Configuration Progress"
+#: field:misc_tools.installer,pad:0
+msgid "Native pad integration"
 msgstr ""
 
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 548fe2f3c05..459aab15a98 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/i18n/fr.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot
index 42cae0e9680..d999a94a51e 100644
--- a/addons/project/i18n/project.pot
+++ b/addons/project/i18n/project.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:18+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:18+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -329,6 +329,11 @@ msgstr ""
 msgid "Mail Header"
 msgstr ""
 
+#. module: project
+#: view:project.installer:0
+msgid "Configure Your Project Management Application"
+msgstr ""
+
 #. module: project
 #: model:process.node,name:project.process_node_donetask0
 msgid "Done task"
@@ -399,8 +404,8 @@ msgid "Estimated time to close this task by the delegated user"
 msgstr ""
 
 #. module: project
-#: field:project.task,work_ids:0
-msgid "Work done"
+#: view:project.project:0
+msgid "Reactivate Project"
 msgstr ""
 
 #. module: project
@@ -715,6 +720,11 @@ msgstr ""
 msgid "New title of the task delegated to the user"
 msgstr ""
 
+#. module: project
+#: view:project.installer:0
+msgid "Various OpenERP applications are available to manage your projects with different level of control and flexibility."
+msgstr ""
+
 #. module: project
 #: view:project.vs.hours:0
 msgid "Project vs Planned and Total Hours"
@@ -796,8 +806,8 @@ msgid "Project Management"
 msgstr ""
 
 #. module: project
-#: field:project.installer,progress:0
-msgid "Configuration Progress"
+#: selection:report.project.task.user,month:0
+msgid "August"
 msgstr ""
 
 #. module: project
@@ -914,8 +924,8 @@ msgid "Gives the sequence order when displaying a list of task"
 msgstr ""
 
 #. module: project
-#: field:project.project,warn_customer:0
-msgid "Warn Partner"
+#: model:ir.actions.act_window,help:project.open_view_project_all
+msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel. A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section."
 msgstr ""
 
 #. module: project
@@ -1031,8 +1041,8 @@ msgid "Stages"
 msgstr ""
 
 #. module: project
-#: selection:report.project.task.user,month:0
-msgid "August"
+#: view:project.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: project
@@ -1046,6 +1056,11 @@ msgstr ""
 msgid "New state of your own task. Pending will be reopened automatically when the delegated task is closed"
 msgstr ""
 
+#. module: project
+#: field:project.project,warn_customer:0
+msgid "Warn Partner"
+msgstr ""
+
 #. module: project
 #: selection:report.project.task.user,month:0
 msgid "June"
@@ -1173,8 +1188,8 @@ msgid "User's projects"
 msgstr ""
 
 #. module: project
-#: view:project.project:0
-msgid "Reactivate Project"
+#: field:project.installer,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
 #. module: project
@@ -1428,11 +1443,6 @@ msgstr ""
 msgid "Bill Time on Tasks"
 msgstr ""
 
-#. module: project
-#: model:ir.actions.act_window,help:project.open_view_project_all
-msgid "A project contains a set of tasks or issues that will be performed by your assigned personnel.  A project can be put into a hierarchy, as a child of a Parent Project. This allows you to design large project structure with different phases spread over the project's duration cycle. Each user can set his default project in his own preferences, in order to filter automatically the tasks or issues he usually works on. If you have personalized your Project application in order to invoice the time spent on a task, you can choose to invoice or not one project in the billing section."
-msgstr ""
-
 #. module: project
 #: view:board.board:0
 msgid "My Remaining Hours by Project"
@@ -1487,6 +1497,7 @@ msgstr ""
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_installer
+#: view:project.installer:0
 msgid "Project Application Configuration"
 msgstr ""
 
@@ -1693,6 +1704,11 @@ msgstr ""
 msgid "Task '%s' cancelled"
 msgstr ""
 
+#. module: project
+#: field:project.task,work_ids:0
+msgid "Work done"
+msgstr ""
+
 #. module: project
 #: help:project.task.delegate,planned_hours_me:0
 msgid "Estimated time for you to validate the work done by the user to whom you delegate this task"
diff --git a/addons/project/project.py b/addons/project/project.py
index 7aa94fba079..1df4b0dca96 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -104,16 +104,12 @@ class project(osv.osv):
         return res
 
     def _get_project_task(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         result = {}
         for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
             if task.project_id: result[task.project_id.id] = True
         return result.keys()
 
     def _get_project_work(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         result = {}
         for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
             if work.task_id and work.task_id.project_id: result[work.task_id.project_id.id] = True
@@ -168,12 +164,12 @@ class project(osv.osv):
     }
 
     # TODO: Why not using a SQL contraints ?
-    def _check_dates(self, cr, uid, ids):
-         for leave in self.read(cr, uid, ids, ['date_start', 'date']):
+    def _check_dates(self, cr, uid, ids, context=None):
+        for leave in self.read(cr, uid, ids, ['date_start', 'date'], context=context):
              if leave['date_start'] and leave['date']:
                  if leave['date_start'] > leave['date']:
                      return False
-         return True
+        return True
 
     _constraints = [
         (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date'])
@@ -382,8 +378,6 @@ class task(osv.osv):
         return res
 
     def _get_task(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         result = {}
         for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
             if work.task_id: result[work.task_id.id] = True
@@ -451,8 +445,8 @@ class task(osv.osv):
 
     _order = "sequence, priority, date_start, id"
 
-    def _check_recursion(self, cr, uid, ids):
-        obj_task = self.browse(cr, uid, ids[0])
+    def _check_recursion(self, cr, uid, ids, context=None):
+        obj_task = self.browse(cr, uid, ids[0], context=context)
         parent_ids = [x.id for x in obj_task.parent_ids]
         children_ids = [x.id for x in obj_task.child_ids]
 
@@ -487,7 +481,7 @@ class task(osv.osv):
 
         # read uom as admin to avoid access rights issues, e.g. for portal/share users,
         # this should be safe (no context passed to avoid side-effects)
-        obj_tm = users_obj.browse(cr, 1, uid).company_id.project_time_mode_id
+        obj_tm = users_obj.browse(cr, 1, uid, context=context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
 
         res = super(task, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
@@ -537,8 +531,6 @@ class task(osv.osv):
         """
         Close Task
         """
-        if context is None:
-            context = {}
         request = self.pool.get('res.request')
         for task in self.browse(cr, uid, ids, context=context):
             project = task.project_id
@@ -569,8 +561,6 @@ class task(osv.osv):
         return True
 
     def do_reopen(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         request = self.pool.get('res.request')
 
         for task in self.browse(cr, uid, ids, context=context):
@@ -629,8 +619,6 @@ class task(osv.osv):
         """
         Delegate Task to another users.
         """
-        if context is None:
-            context = {}
         task = self.browse(cr, uid, task_id, context=context)
         new_task_id = self.copy(cr, uid, task.id, {
             'name': delegate_data['name'],
@@ -642,17 +630,17 @@ class task(osv.osv):
             'description': delegate_data['new_task_description'] or '',
             'child_ids': [],
             'work_ids': []
-        }, context)
+        }, context=context)
         newname = delegate_data['prefix'] or ''
         self.write(cr, uid, [task.id], {
             'remaining_hours': delegate_data['planned_hours_me'],
             'planned_hours': delegate_data['planned_hours_me'] + (task.effective_hours or 0.0),
             'name': newname,
-        }, context)
+        }, context=context)
         if delegate_data['state'] == 'pending':
             self.do_pending(cr, uid, [task.id], context)
         else:
-            self.do_close(cr, uid, [task.id], context)
+            self.do_close(cr, uid, [task.id], context=context)
         user_pool = self.pool.get('res.users')
         delegate_user = user_pool.browse(cr, uid, delegate_data['user_id'], context=context)
         message = _("The task '%s' has been delegated to %s.") % (delegate_data['name'], delegate_user.name)
@@ -715,11 +703,11 @@ class project_work(osv.osv):
             cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (vals.get('hours',0.0), vals['task_id']))
         return super(project_work,self).create(cr, uid, vals, *args, **kwargs)
 
-    def write(self, cr, uid, ids,vals,context={}):
+    def write(self, cr, uid, ids, vals, context=None):
         if 'hours' in vals and (not vals['hours']):
             vals['hours'] = 0.00
         if 'hours' in vals:
-            for work in self.browse(cr, uid, ids, context):
+            for work in self.browse(cr, uid, ids, context=context):
                 cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (vals.get('hours',0.0), work.hours, work.task_id.id))
         return super(project_work,self).write(cr, uid, ids, vals, context)
 
diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py
index 61fec536e50..72b32f7db68 100644
--- a/addons/project/wizard/project_task_delegate.py
+++ b/addons/project/wizard/project_task_delegate.py
@@ -79,7 +79,7 @@ class project_task_delegate(osv.osv_memory):
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         res = super(project_task_delegate, self).fields_view_get(cr, uid, view_id, view_type, context, toolbar, submenu=submenu)
         users_pool = self.pool.get('res.users')
-        obj_tm = users_pool.browse(cr, uid, uid, context).company_id.project_time_mode_id
+        obj_tm = users_pool.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
         tm = obj_tm and obj_tm.name or 'Hours'
         if tm in ['Hours','Hour']:
             return res
diff --git a/addons/project_caldav/i18n/project_caldav.pot b/addons/project_caldav/i18n/project_caldav.pot
index b1c98a8db8c..e05dbb9ed9d 100644
--- a/addons/project_caldav/i18n/project_caldav.pot
+++ b/addons/project_caldav/i18n/project_caldav.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:19+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_caldav/project_caldav.py b/addons/project_caldav/project_caldav.py
index f1a4bc73e4b..ada89d35e69 100644
--- a/addons/project_caldav/project_caldav.py
+++ b/addons/project_caldav/project_caldav.py
@@ -57,9 +57,6 @@ class project_task(osv.osv):
         @return: Dictionary value which open Project Task form.
         """
 
-        if not context:
-            context = {}
-
         data_pool = self.pool.get('ir.model.data')
         value = {}
         task_form_id = data_pool.get_object(cr, uid, 'project', 'view_task_form2')
@@ -91,7 +88,7 @@ class project_task(osv.osv):
             context = {}
         ids = []
         for val in vals:
-            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context).company_id.project_time_mode_id
+            obj_tm = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.project_time_mode_id
             if not val.get('planned_hours', False):
                 # 'Computes duration' in days
                 plan = 0.0
diff --git a/addons/project_gtd/i18n/project_gtd.pot b/addons/project_gtd/i18n/project_gtd.pot
index 2654f93480b..fb5d4eb0202 100644
--- a/addons/project_gtd/i18n/project_gtd.pot
+++ b/addons/project_gtd/i18n/project_gtd.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:19+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:19+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:08+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:08+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_gtd/i18n/pt.po b/addons/project_gtd/i18n/pt.po
index 6aff0592e1c..042d4ae5ca0 100644
--- a/addons/project_gtd/i18n/pt.po
+++ b/addons/project_gtd/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2009-09-16 12:23+0000\n"
+"PO-Revision-Date: 2010-12-15 05:28+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:08+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
diff --git a/addons/project_gtd/wizard/project_gtd_fill.py b/addons/project_gtd/wizard/project_gtd_fill.py
index 332a7f072a8..db0d7187500 100644
--- a/addons/project_gtd/wizard/project_gtd_fill.py
+++ b/addons/project_gtd/wizard/project_gtd_fill.py
@@ -32,8 +32,6 @@ class project_timebox_fill(osv.osv_memory):
     }
 
     def _get_from_tb(self, cr, uid, context=None):
-        if context is None:
-            context = {}
         ids = self.pool.get('project.gtd.timebox').search(cr, uid, [], context=context)
         return ids and ids[0] or False
 
@@ -50,11 +48,9 @@ class project_timebox_fill(osv.osv_memory):
     }
 
     def process(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         if not ids:
             return {}
-        data = self.read(cr, uid, ids, [])
+        data = self.read(cr, uid, ids, [], context=context)
         if not data[0]['task_ids']:
             return {}
         self.pool.get('project.task').write(cr, uid, data[0]['task_ids'], {'timebox_id':data[0]['timebox_to_id']})
diff --git a/addons/project_issue/i18n/project_issue.pot b/addons/project_issue/i18n/project_issue.pot
index 9e81f071816..7ea41d7a0c8 100644
--- a/addons/project_issue/i18n/project_issue.pot
+++ b/addons/project_issue/i18n/project_issue.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:20+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:20+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:09+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:09+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 2887b25610d..dc272404688 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -78,8 +78,6 @@ class project_issue(crm.crm_case, osv.osv):
         return res
 
     def _compute_day(self, cr, uid, ids, fields, args, context=None):
-        if context is None:
-            context = {}
         """
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
@@ -143,8 +141,6 @@ class project_issue(crm.crm_case, osv.osv):
         return res
 
     def _get_issue_task(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         issues = []
         issue_pool = self.pool.get('project.issue')
         for task in self.pool.get('project.task').browse(cr, uid, ids, context=context):
@@ -152,8 +148,6 @@ class project_issue(crm.crm_case, osv.osv):
         return issues
 
     def _get_issue_work(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         issues = []
         issue_pool = self.pool.get('project.issue')
         for work in self.pool.get('project.task.work').browse(cr, uid, ids, context=context):
@@ -230,7 +224,7 @@ class project_issue(crm.crm_case, osv.osv):
             }),
     }
 
-    def _get_project(self, cr, uid, context):
+    def _get_project(self, cr, uid, context=None):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if user.context_project_id:
             return user.context_project_id.id
@@ -339,12 +333,10 @@ class project_issue(crm.crm_case, osv.osv):
 
 
     def onchange_task_id(self, cr, uid, ids, task_id, context=None):
-        if context is None:
-            context = {}
         result = {}
         if not task_id:
             return {'value':{}}
-        task = self.pool.get('project.task').browse(cr, uid, task_id, context)
+        task = self.pool.get('project.task').browse(cr, uid, task_id, context=context)
         return {'value':{'assigned_to': task.user_id.id,}}
 
     def case_escalate(self, cr, uid, ids, *args):
@@ -370,7 +362,7 @@ class project_issue(crm.crm_case, osv.osv):
         self._history(cr, uid, cases, _('Escalate'))
         return True
 
-    def message_new(self, cr, uid, msg, context):
+    def message_new(self, cr, uid, msg, context=None):
         """
         Automatically calls when new email message arrives
 
@@ -378,7 +370,8 @@ class project_issue(crm.crm_case, osv.osv):
         @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks
         """
-
+        if context is None: 
+            context = {}
         mailgate_pool = self.pool.get('email.server.tools')
 
         subject = msg.get('subject') or _('No Title')
@@ -400,7 +393,7 @@ class project_issue(crm.crm_case, osv.osv):
         if res:
             vals.update(res)
         context.update({'state_to' : 'draft'})
-        res = self.create(cr, uid, vals, context)
+        res = self.create(cr, uid, vals, context=context)
         self.convert_to_bug(cr, uid, [res], context=context)
 
         attachents = msg.get('attachments', [])
@@ -418,8 +411,6 @@ class project_issue(crm.crm_case, osv.osv):
         return res
 
     def message_update(self, cr, uid, ids, vals={}, msg="", default_act='pending', context=None):
-        if context is None:
-            context = {}
         """
         @param self: The object pointer
         @param cr: the current row, from the database cursor,
@@ -466,8 +457,6 @@ class project_issue(crm.crm_case, osv.osv):
         return True
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if not context:
-            context={}
         issue = self.read(cr, uid, id, ['name'], context=context)
         if not default:
             default = {}
@@ -486,8 +475,8 @@ class project(osv.osv):
         'reply_to' : fields.char('Reply-To Email Address', size=256)
     }
 
-    def _check_escalation(self, cr, uid, ids):
-         project_obj = self.browse(cr, uid, ids[0])
+    def _check_escalation(self, cr, uid, ids, context=None):
+         project_obj = self.browse(cr, uid, ids[0], context=context)
          if project_obj.project_escalation_id:
              if project_obj.project_escalation_id.id == project_obj.id:
                  return False
diff --git a/addons/project_issue_sheet/i18n/project_issue_sheet.pot b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
index 1fffb906a1e..1a8e392bf98 100644
--- a/addons/project_issue_sheet/i18n/project_issue_sheet.pot
+++ b/addons/project_issue_sheet/i18n/project_issue_sheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:20+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:20+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_long_term/i18n/project_long_term.pot b/addons/project_long_term/i18n/project_long_term.pot
index 2e28070c646..c3a219ab6a8 100644
--- a/addons/project_long_term/i18n/project_long_term.pot
+++ b/addons/project_long_term/i18n/project_long_term.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:21+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -224,6 +224,7 @@ msgid "Compute Scheduling of Task"
 msgstr ""
 
 #. module: project_long_term
+#: model:ir.actions.act_window,name:project_long_term.act_project_resource
 #: model:ir.ui.menu,name:project_long_term.menu_pm_resources_project1
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource
 #: view:project.resource.allocation:0
@@ -500,7 +501,7 @@ msgstr ""
 
 #. module: project_long_term
 #: model:ir.ui.menu,name:project_long_term.menu_view_resource_calendar
-msgid "Working Time"
+msgid "Working Period"
 msgstr ""
 
 #. module: project_long_term
diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py
index faea0916906..4640ea8fa48 100644
--- a/addons/project_long_term/project_long_term.py
+++ b/addons/project_long_term/project_long_term.py
@@ -153,8 +153,6 @@ class project_phase(osv.osv):
         return {'value': result}
 
     def _check_date_start(self, cr, uid, phase, date_end, context=None):
-       if context is None:
-            context = {}
        """
        Check And Compute date_end of phase if change in date_start < older time.
        """
@@ -175,8 +173,6 @@ class project_phase(osv.osv):
        self.write(cr, uid, [phase.id], {'date_start': dt_start, 'date_end': date_end.strftime('%Y-%m-%d')}, context=context)
 
     def _check_date_end(self, cr, uid, phase, date_start, context=None):
-       if context is None:
-            context = {}
        """
        Check And Compute date_end of phase if change in date_end > older time.
        """
@@ -277,8 +273,6 @@ class project_phase(osv.osv):
         Return a list of  Resource Class objects for the resources allocated to the phase.
         """
         res = {}
-        if context is None:
-            context = {}
         resource_pool = self.pool.get('resource.resource')
         for phase in self.browse(cr, uid, ids, context=context):
             user_ids = map(lambda x:x.resource_id.user_id.id, phase.resource_ids)
@@ -299,8 +293,6 @@ class project_phase(osv.osv):
         resource_pool = self.pool.get('resource.resource')
         resource_allocation_pool = self.pool.get('project.resource.allocation')
         uom_pool = self.pool.get('product.uom')
-        if context is None:
-           context = {}
         default_uom_id = self._get_default_uom_id(cr, uid)
         for phase in self.browse(cr, uid, ids, context=context):
             if not phase.responsible_id:
@@ -366,8 +358,6 @@ class project_phase(osv.osv):
         """
         task_pool = self.pool.get('project.task')
         resource_pool = self.pool.get('resource.resource')
-        if context is None:
-            context = {}
         resources_list = self.generate_resources(cr, uid, ids, context=context)
         return_msg = {}
         for phase in self.browse(cr, uid, ids, context=context):
@@ -431,8 +421,6 @@ class project(osv.osv):
         """
         res = {}
         resource_pool = self.pool.get('resource.resource')
-        if context is None:
-            context = {}
         for project in self.browse(cr, uid, ids, context=context):
             user_ids = map(lambda x:x.id, project.members)
             calendar_id  = project.resource_calendar_id and project.resource_calendar_id.id or False
@@ -444,8 +432,6 @@ class project(osv.osv):
         """
         Schedule the phases.
         """
-        if context is None:
-            context = {}
         if type(ids) in (long, int,):
             ids = [ids]
         phase_pool = self.pool.get('project.phase')
@@ -471,9 +457,6 @@ class project(osv.osv):
         user_pool = self.pool.get('res.users')
         task_pool = self.pool.get('project.task')
         resource_pool = self.pool.get('resource.resource')
-        if context is None:
-            context = {}
-
         resources_list = self.generate_members(cr, uid, ids, context=context)
         return_msg = {}
         for project in self.browse(cr, uid, ids, context=context):
@@ -507,7 +490,7 @@ class resource_resource(osv.osv):
             context = {}
         if context.get('project_id',False):
             project_pool = self.pool.get('project.project')
-            project_rec = project_pool.browse(cr, uid, context['project_id'])
+            project_rec = project_pool.browse(cr, uid, context['project_id'], context=context)
             user_ids = [user_id.id for user_id in project_rec.members]
             args.append(('user_id','in',user_ids))
         return super(resource_resource, self).search(cr, uid, args, offset, limit, order, context, count)
diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py
index ade1da5c9d9..351297384fd 100644
--- a/addons/project_long_term/wizard/project_compute_phases.py
+++ b/addons/project_long_term/wizard/project_compute_phases.py
@@ -44,8 +44,6 @@ class project_compute_phases(osv.osv_memory):
         """
         Compute the phases for scheduling.
         """
-        if context is None:
-            context = {}
         project_pool = self.pool.get('project.project')
         data = self.read(cr, uid, ids, [], context=context)[0]
         if not data['project_id'] and data['target_project'] == 'one':
diff --git a/addons/project_long_term/wizard/project_schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 48039112e86..1a9081b1f5d 100644
--- a/addons/project_long_term/wizard/project_schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -32,8 +32,6 @@ class project_schedule_task(osv.osv_memory):
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
-        if context is None:
-            context = {}
         res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context)
         self.compute_date(cr, uid, context=context)
         return res
diff --git a/addons/project_mailgate/i18n/project_mailgate.pot b/addons/project_mailgate/i18n/project_mailgate.pot
index 4d1981d7ba6..3e530921bfe 100644
--- a/addons/project_mailgate/i18n/project_mailgate.pot
+++ b/addons/project_mailgate/i18n/project_mailgate.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:21+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:21+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:10+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:10+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_mailgate/project_mailgate.py b/addons/project_mailgate/project_mailgate.py
index c232b41fe76..64bb8c2dc69 100644
--- a/addons/project_mailgate/project_mailgate.py
+++ b/addons/project_mailgate/project_mailgate.py
@@ -99,7 +99,7 @@ class project_tasks(osv.osv):
             select = [ids]
         else:
             select = ids
-        for task in self.browse(cr, uid, select):
+        for task in self.browse(cr, uid, select, context=context):
             user_email = (task.user_id and task.user_id.address_id and task.user_id.address_id.email) or False
             res += [(user_email, False, False, task.priority)]
         if isinstance(ids, (str, int, long)):
@@ -109,7 +109,7 @@ class project_tasks(osv.osv):
     def msg_send(self, cr, uid, id, *args, **argv):
         return True
     
-    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context={}):
+    def _history(self, cr, uid, cases, keyword, history=False, subject=None, email=False, details=None, email_from=False, message_id=False, attach=[], context=None):
         mailgate_pool = self.pool.get('mailgate.thread')
         return mailgate_pool.history(cr, uid, cases, keyword, history=history,\
                                        subject=subject, email=email, \
diff --git a/addons/project_messages/i18n/project_messages.pot b/addons/project_messages/i18n/project_messages.pot
index 84cf402def1..c5c34221779 100644
--- a/addons/project_messages/i18n/project_messages.pot
+++ b/addons/project_messages/i18n/project_messages.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:22+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:22+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:11+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_mrp/i18n/project_mrp.pot b/addons/project_mrp/i18n/project_mrp.pot
index c90f5fa5d49..ae34ebb4811 100644
--- a/addons/project_mrp/i18n/project_mrp.pot
+++ b/addons/project_mrp/i18n/project_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:22+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:22+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:11+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:11+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_mrp/i18n/pt.po b/addons/project_mrp/i18n/pt.po
index b423b24816c..4614bd1fad2 100644
--- a/addons/project_mrp/i18n/pt.po
+++ b/addons/project_mrp/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2009-09-08 13:24+0000\n"
+"PO-Revision-Date: 2010-12-15 13:49+0000\n"
 "Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:23+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 393961a005d..7e7978eda59 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -29,13 +29,11 @@ class procurement_order(osv.osv):
     _columns = {
         'task_id': fields.many2one('project.task', 'Task')
     }
-    def check_produce_service(self, cr, uid, procurement, context=[]):
+    def check_produce_service(self, cr, uid, procurement, context=None):
         return True
 
     def action_produce_assign_service(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        for procurement in self.browse(cr, uid, ids):
+        for procurement in self.browse(cr, uid, ids, context=context):
             self.write(cr, uid, [procurement.id], {'state': 'running'})
             planned_hours = procurement.product_qty
             task_id = self.pool.get('project.task').create(cr, uid, {
diff --git a/addons/project_planning/i18n/project_planning.pot b/addons/project_planning/i18n/project_planning.pot
index 777ff036696..0a49743bd7e 100644
--- a/addons/project_planning/i18n/project_planning.pot
+++ b/addons/project_planning/i18n/project_planning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:23+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:23+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:12+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 83c9cd6dff5..dc89bcd4d31 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -30,8 +30,6 @@ import tools
 
 class one2many_mod3(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
-            context = context
         res = {}
         for obj in obj.browse(cr, user, ids, context=context):
             res[obj.id] = []
@@ -52,8 +50,6 @@ class report_account_analytic_planning(osv.osv):
     _description = "Planning"
 
     def _child_compute(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         obj_dept = self.pool.get('hr.department')
         obj_user = self.pool.get('res.users')
         result = {}
@@ -82,7 +78,7 @@ class report_account_analytic_planning(osv.osv):
 
     def _get_total_planned(self, cr, uid, ids, name, args, context=None):
         result = {}
-        for plan in self.browse(cr, uid, ids, context):
+        for plan in self.browse(cr, uid, ids, context=context):
             plan_hrs=0.0
             for p in plan.planning_user_ids:
                 if not p.plan_open : p.plan_open = 0.0
@@ -93,7 +89,7 @@ class report_account_analytic_planning(osv.osv):
 
     def _get_total_free(self, cr, uid, ids, name, args, context=None):
         result = {}
-        for plan in self.browse(cr, uid, ids, context):
+        for plan in self.browse(cr, uid, ids, context=context):
             total_free = 0.0
             for p in plan.planning_user_ids:
                 if  p.free:
@@ -102,8 +98,6 @@ class report_account_analytic_planning(osv.osv):
         return result
 
     def _check_planning_responsible(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for obj_plan in self.browse(cr, uid, ids, context=context):
             cr.execute("""
                 SELECT id FROM report_account_analytic_planning plan
@@ -151,26 +145,18 @@ class report_account_analytic_planning(osv.osv):
     ]
 
     def action_open(self, cr, uid, id, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, id, {'state' : 'open'}, context=context)
         return True
 
     def action_cancel(self, cr, uid, id, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, id, {'state' : 'cancel'}, context=context)
         return True
 
     def action_draft(self, cr, uid, id, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, id, {'state' : 'draft'}, context=context)
         return True
 
     def action_done(self, cr, uid, id, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, id, {'state' : 'done'}, context=context)
         return True
 
@@ -182,11 +168,9 @@ class report_account_analytic_planning_line(osv.osv):
     _rec_name = 'user_id'
 
     def name_get(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         if not len(ids):
             return []
-        reads = self.read(cr, uid, ids, ['user_id', 'planning_id', 'note'], context)
+        reads = self.read(cr, uid, ids, ['user_id', 'planning_id', 'note'], context=context)
         res = []
         for record in reads:
             name = '['+record['planning_id'][1]
@@ -200,16 +184,14 @@ class report_account_analytic_planning_line(osv.osv):
         return res
 
     def _amount_base_uom(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
-        tm = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             result[line.id] = line.amount / line.amount_unit.factor * div
         return result
 
@@ -244,7 +226,7 @@ class project_task(osv.osv):
     }
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
-        if not context:
+        if context is None:
             context = {}
         if not context.get('planning', False):
             return super(project_task,self).search(cr, user, args, offset, limit, order, context)
@@ -264,8 +246,6 @@ class report_account_analytic_planning_user(osv.osv):
     _auto = False
 
     def _get_tasks(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
         tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
@@ -278,7 +258,7 @@ class report_account_analytic_planning_user(osv.osv):
             div2 = tm2.factor
         else:
             div2 = 1.0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.user_id:
                 cr.execute("""select COALESCE(sum(tasks.remaining_hours),0) from project_task tasks \
                                where  tasks.planning_line_id IN (select id from report_account_analytic_planning_line\
@@ -290,10 +270,8 @@ class report_account_analytic_planning_user(osv.osv):
         return result
 
     def _get_free(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         result = {}
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.user_id:
                 result[line.id] = line.planning_id.business_days - line.plan_tasks - line.plan_open - line.holiday
             else:
@@ -301,16 +279,14 @@ class report_account_analytic_planning_user(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
             div2 = 1.0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.user_id:
                 cr.execute("""
                 SELECT sum(unit_amount/uom.factor) FROM account_analytic_line acc
@@ -412,21 +388,19 @@ class report_account_analytic_planning_account(osv.osv):
     _auto = False
 
     def _get_tasks(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
-        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
             div2 = 1.0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             cr.execute("""
                 SELECT COALESCE(sum(tasks.remaining_hours),0)
                 FROM project_task tasks
@@ -439,16 +413,14 @@ class report_account_analytic_planning_account(osv.osv):
         return result
 
     def _get_timesheets(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
             div2 = 1.0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             cr.execute("""
                 SELECT SUM(unit_amount/uom.factor) FROM account_analytic_line acc
                 LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
@@ -513,16 +485,14 @@ class report_account_analytic_planning_stat(osv.osv):
     _order = 'planning_id,user_id'
 
     def _sum_amount_real(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
-        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
             div2 = 1.0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.user_id:
                 cr.execute('''SELECT sum(acc.unit_amount/uom.factor) FROM account_analytic_line acc
                 LEFT JOIN product_uom uom ON (uom.id = acc.product_uom_id)
@@ -536,21 +506,19 @@ WHERE user_id=%s and account_id=%s and date>=%s and date<=%s''', (line.user_id.i
         return result
 
     def _sum_amount_tasks(self, cr, uid, ids, name, args, context=None):
-        if context is None:
-            context = {}
         users_obj = self.pool.get('res.users')
         result = {}
-        tm = users_obj.browse(cr, uid, uid, context).company_id.project_time_mode_id
+        tm = users_obj.browse(cr, uid, uid, context=context).company_id.project_time_mode_id
         if tm and tm.factor:
             div = tm.factor
         else:
             div = 1.0
-        tm2 = users_obj.browse(cr, uid, uid, context).company_id.planning_time_mode_id
+        tm2 = users_obj.browse(cr, uid, uid, context=context).company_id.planning_time_mode_id
         if tm2 and tm2.factor:
             div2 = tm2.factor
         else:
             div2 = 1.0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             where = ''
             if line.user_id:
                 where = 'user_id=' + str(line.user_id.id) + ' and '
diff --git a/addons/project_retro_planning/i18n/project_retro_planning.pot b/addons/project_retro_planning/i18n/project_retro_planning.pot
index da221c219e6..a9164ea6e53 100644
--- a/addons/project_retro_planning/i18n/project_retro_planning.pot
+++ b/addons/project_retro_planning/i18n/project_retro_planning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:23+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:23+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:12+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:12+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot
index 3e126bed3c0..b42dd83ff20 100644
--- a/addons/project_scrum/i18n/project_scrum.pot
+++ b/addons/project_scrum/i18n/project_scrum.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:24+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:24+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:13+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/project_scrum/i18n/sv.po b/addons/project_scrum/i18n/sv.po
index 4bc16b08cc7..474c192a51a 100644
--- a/addons/project_scrum/i18n/sv.po
+++ b/addons/project_scrum/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 16:28+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-12-16 03:09+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_scrum
diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py
index 0e516376ffb..7d1d071a7c3 100644
--- a/addons/project_scrum/project_scrum.py
+++ b/addons/project_scrum/project_scrum.py
@@ -70,20 +70,14 @@ class project_scrum_sprint(osv.osv):
         return res
 
     def button_cancel(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         return True
 
     def button_draft(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'draft'}, context=context)
         return True
 
     def button_open(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'open'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("The sprint '%s' has been opened.") % (name,)
@@ -91,8 +85,6 @@ class project_scrum_sprint(osv.osv):
         return True
 
     def button_close(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'done'}, context=context)
         for (id, name) in self.name_get(cr, uid, ids):
             message = _("The sprint '%s' has been closed.") % (name,)
@@ -100,8 +92,6 @@ class project_scrum_sprint(osv.osv):
         return True
 
     def button_pending(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
@@ -134,8 +124,6 @@ class project_scrum_sprint(osv.osv):
         @param ids: List of case’s IDs
         @param context: A standard dictionary for contextual values
         """
-        if context is None:
-            context = {}
         if default is None:
             default = {}
         default.update({'backlog_ids': [], 'meeting_ids': []})
@@ -159,8 +147,6 @@ class project_scrum_product_backlog(osv.osv):
     def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args=[]
-        if not context:
-            context={}
         if name:
             match = re.match('^S\(([0-9]+)\)$', name)
             if match:
@@ -173,8 +159,6 @@ class project_scrum_product_backlog(osv.osv):
         progress = {}
         if not ids:
             return res
-        if context is None:
-            context = {}
         for backlog in self.browse(cr, uid, ids, context=context):
             tot = 0.0
             prog = 0.0
@@ -197,28 +181,20 @@ class project_scrum_product_backlog(osv.osv):
 
     def button_cancel(self, cr, uid, ids, context=None):
         obj_project_task = self.pool.get('project.task')
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'cancel'}, context=context)
         for backlog in self.browse(cr, uid, ids, context=context):
             obj_project_task.write(cr, uid, [i.id for i in backlog.tasks_id], {'state': 'cancelled'})
         return True
 
     def button_draft(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'draft'}, context=context)
         return True
 
     def button_open(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'open'}, context=context)
         return True
 
     def button_close(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         obj_project_task = self.pool.get('project.task')
         self.write(cr, uid, ids, {'state':'done'}, context=context)
         for backlog in self.browse(cr, uid, ids, context=context):
@@ -226,14 +202,10 @@ class project_scrum_product_backlog(osv.osv):
         return True
 
     def button_pending(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         self.write(cr, uid, ids, {'state':'pending'}, context=context)
         return True
 
     def button_postpone(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for product in self.browse(cr, uid, ids, context=context):
             tasks_id = []
             for task in product.tasks_id:
@@ -278,8 +250,6 @@ class project_scrum_task(osv.osv):
 
     def _get_task(self, cr, uid, ids, context=None):
         result = {}
-        if context is None:
-            context = {}
         for line in self.pool.get('project.scrum.product.backlog').browse(cr, uid, ids, context=context):
             for task in line.tasks_id:
                 result[task.id] = True
@@ -324,9 +294,7 @@ class project_scrum_meeting(osv.osv):
     }
 
     def button_send_to_master(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
-        meeting_id = self.browse(cr, uid, ids)[0]
+        meeting_id = self.browse(cr, uid, ids, context=context)[0]
         if meeting_id and meeting_id.sprint_id.scrum_master_id.user_email:
             res = self.email_send(cr, uid, ids, meeting_id.sprint_id.scrum_master_id.user_email)
             if not res:
@@ -339,7 +307,7 @@ class project_scrum_meeting(osv.osv):
         if context is None:
             context = {}
         context.update({'button_send_product_owner': True})
-        meeting_id = self.browse(cr, uid, ids)[0]
+        meeting_id = self.browse(cr, uid, ids, context=context)[0]
         if meeting_id.sprint_id.product_owner_id.user_email:
             res = self.email_send(cr,uid,ids,meeting_id.sprint_id.product_owner_id.user_email)
             if not res:
@@ -349,10 +317,8 @@ class project_scrum_meeting(osv.osv):
         return True
 
     def email_send(self, cr, uid, ids, email, context=None):
-        if context is None:
-            context = {}
         email_from = tools.config.get('email_from', False)
-        meeting_id = self.browse(cr,uid,ids)[0]
+        meeting_id = self.browse(cr, uid, ids, context=context)[0]
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         user_email = email_from or user.address_id.email  or email_from
         body = _('Hello ') + meeting_id.sprint_id.scrum_master_id.name + ",\n" + " \n" +_('I am sending you Daily Meeting Details of date')+ ' %s ' % (meeting_id.date)+ _('for the Sprint')+ ' %s\n' % (meeting_id.sprint_id.name)
diff --git a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
index 827c88b0630..afa4f40a5f8 100644
--- a/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
+++ b/addons/project_scrum/wizard/project_scrum_backlog_create_task.py
@@ -34,8 +34,6 @@ class backlog_create_task(osv.osv_memory):
         document_pool = self.pool.get('ir.attachment')
         ids_task = []
 
-        if context is None:
-            context = {}
         data = self.read(cr, uid, ids, [], context=context)[0]
         backlogs = backlog_id.browse(cr, uid, context['active_ids'], context=context)
         result = mod_obj._get_id(cr, uid, 'project', 'view_task_search_form')
diff --git a/addons/project_scrum/wizard/project_scrum_email.py b/addons/project_scrum/wizard/project_scrum_email.py
index 4d09cecf8ed..3fca16e555f 100644
--- a/addons/project_scrum/wizard/project_scrum_email.py
+++ b/addons/project_scrum/wizard/project_scrum_email.py
@@ -38,6 +38,8 @@ class project_scrum_email(osv.osv_memory):
 
         @return : default values of fields.
         """
+        if context is None:
+            context = {}
         meeting_pool = self.pool.get('project.scrum.meeting')
         record_ids = context and context.get('active_ids', []) or []
         res = super(project_scrum_email, self).default_get(cr, uid, fields, context=context)
@@ -65,7 +67,7 @@ class project_scrum_email(osv.osv_memory):
 
     def button_send_scrum_email(self, cr, uid, ids, context=None):
         if context is None:
-            context={}
+            context = {}
 
         active_id = context.get('active_id', False)
         scrum_meeting_pool = self.pool.get('project.scrum.meeting')
diff --git a/addons/project_scrum/wizard/project_scrum_postpone.py b/addons/project_scrum/wizard/project_scrum_postpone.py
index 27173cf9fe0..52a12446c23 100644
--- a/addons/project_scrum/wizard/project_scrum_postpone.py
+++ b/addons/project_scrum/wizard/project_scrum_postpone.py
@@ -26,7 +26,7 @@ class postpone_wizard(osv.osv_memory):
     def button_postpone(self, cr, uid, ids, context=None):
         if context is None:
             context = {}    
-        self.pool.get('project.scrum.product.backlog').button_postpone(cr, uid, context.get('active_ids',[]), context)
+        self.pool.get('project.scrum.product.backlog').button_postpone(cr, uid, context.get('active_ids',[]), context=context)
         return {}
 postpone_wizard()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_timesheet/i18n/project_timesheet.pot b/addons/project_timesheet/i18n/project_timesheet.pot
index a83ed06d339..2274ea7ded8 100644
--- a/addons/project_timesheet/i18n/project_timesheet.pot
+++ b/addons/project_timesheet/i18n/project_timesheet.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:24+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:24+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:13+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:13+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -33,6 +33,11 @@ msgstr ""
 msgid "Timesheet task"
 msgstr ""
 
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Search Analytic Lines"
+msgstr ""
+
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
 msgid "Related Timeline Id"
@@ -44,6 +49,12 @@ msgid "Project Task Work"
 msgstr ""
 
 #. module: project_timesheet
+#: selection:report.timesheet.task.user,month:0
+msgid "February"
+msgstr ""
+
+#. module: project_timesheet
+#: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
 msgstr ""
@@ -54,14 +65,19 @@ msgid "Trigger invoices from sale order lines"
 msgstr ""
 
 #. module: project_timesheet
-#: model:ir.model,name:project_timesheet.model_project_task
-msgid "Task"
+#: selection:report.timesheet.task.user,month:0
+msgid "October"
 msgstr ""
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
-#: field:report.timesheet.task.user,month:0
-msgid "Month"
+#: field:report.timesheet.task.user,year:0
+msgid "Year"
+msgstr ""
+
+#. module: project_timesheet
+#: field:report.timesheet.task.user,task_hrs:0
+msgid "Task Hours"
 msgstr ""
 
 #. module: project_timesheet
@@ -74,6 +90,11 @@ msgstr ""
 msgid " Year "
 msgstr ""
 
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Product"
+msgstr ""
+
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "March"
@@ -104,18 +125,33 @@ msgstr ""
 msgid "Error ! You cannot create recursive tasks."
 msgstr ""
 
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Journal"
+msgstr ""
+
 #. module: project_timesheet
 #: selection:report.timesheet.task.user,month:0
 msgid "June"
 msgstr ""
 
 #. module: project_timesheet
-#: view:report.timesheet.task.user:0
-#: field:report.timesheet.task.user,year:0
-msgid "Year"
+#: view:account.analytic.line:0
+msgid "My Entries"
 msgstr ""
 
 #. module: project_timesheet
+#: model:ir.model,name:project_timesheet.model_project_task
+msgid "Task"
+msgstr ""
+
+#. module: project_timesheet
+#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
+msgid "Invoice Tasks Work"
+msgstr ""
+
+#. module: project_timesheet
+#: view:account.analytic.line:0
 #: view:report.timesheet.task.user:0
 #: field:report.timesheet.task.user,user_id:0
 msgid "User"
@@ -127,8 +163,8 @@ msgid "Error! You cannot assign escalation to the same project!"
 msgstr ""
 
 #. module: project_timesheet
-#: model:ir.ui.menu,name:project_timesheet.menu_project_billing_line
-msgid "Invoice Tasks Work"
+#: field:report.timesheet.task.user,name:0
+msgid "Date"
 msgstr ""
 
 #. module: project_timesheet
@@ -136,6 +172,11 @@ msgstr ""
 msgid "July"
 msgstr ""
 
+#. module: project_timesheet
+#: view:account.analytic.line:0
+msgid "Extended Filters..."
+msgstr ""
+
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_timesheettask0
 msgid "Complete Your Timesheet."
@@ -147,18 +188,18 @@ msgid "Invoiceable"
 msgstr ""
 
 #. module: project_timesheet
-#: field:report.timesheet.task.user,task_hrs:0
-msgid "Task Hours"
+#: view:project.project:0
+msgid "Customer"
 msgstr ""
 
 #. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "February"
+#: view:account.analytic.line:0
+msgid "Account"
 msgstr ""
 
 #. module: project_timesheet
-#: selection:report.timesheet.task.user,month:0
-msgid "October"
+#: model:ir.actions.act_window,name:project_timesheet.action_project_timesheet_bill_task
+msgid "Bill Tasks Works"
 msgstr ""
 
 #. module: project_timesheet
@@ -220,8 +261,8 @@ msgid "Invoicing Data"
 msgstr ""
 
 #. module: project_timesheet
-#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
-msgid "Encode how much time u spent on your task"
+#: view:account.analytic.line:0
+msgid "Fin.Account"
 msgstr ""
 
 #. module: project_timesheet
@@ -276,8 +317,9 @@ msgid "report.timesheet.task.user"
 msgstr ""
 
 #. module: project_timesheet
-#: field:report.timesheet.task.user,name:0
-msgid "Date"
+#: view:report.timesheet.task.user:0
+#: field:report.timesheet.task.user,month:0
+msgid "Month"
 msgstr ""
 
 #. module: project_timesheet
@@ -285,6 +327,11 @@ msgstr ""
 msgid "Project Timesheet"
 msgstr ""
 
+#. module: project_timesheet
+#: model:process.transition,note:project_timesheet.process_transition_taskencoding0
+msgid "Encode how much time u spent on your task"
+msgstr ""
+
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Invoice Task Work"
@@ -309,3 +356,8 @@ msgstr ""
 msgid "Fill Timesheet"
 msgstr ""
 
+#. module: project_timesheet
+#: model:ir.actions.act_window,help:project_timesheet.action_project_timesheet_bill_task
+msgid "This lists show you every task work you can invoice to the customer. Select the lines in order to generate the invoices automatically."
+msgstr ""
+
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 42104fcddc1..13aae753109 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -29,7 +29,7 @@ from tools.translate import _
 class project_project(osv.osv):
     _inherit = 'project.project'
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
-        result = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context)
+        result = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context=context)
         if result.get('value', False):
             try:
                 d = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1')
@@ -201,9 +201,9 @@ class task(osv.osv):
         if vals.get('project_id',False) or vals.get('name',False):
             vals_line = {}
             hr_anlytic_timesheet = self.pool.get('hr.analytic.timesheet')
-            task_obj_l = self.browse(cr, uid, ids, context)
+            task_obj_l = self.browse(cr, uid, ids, context=context)
             if vals.get('project_id',False):
-                project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'])
+                project_obj = self.pool.get('project.project').browse(cr, uid, vals['project_id'], context=context)
                 acc_id = project_obj.analytic_account_id.id
 
             for task_obj in task_obj_l:
diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po
index cba544db75c..adae802386d 100644
--- a/addons/purchase/i18n/it.po
+++ b/addons/purchase/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-11-01 08:41+0000\n"
+"PO-Revision-Date: 2010-12-16 00:07+0000\n"
 "Last-Translator: Lorenzo Battistini - agilebg.com "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 2df2e22937d..50e6f037529 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-09-09 07:18+0000\n"
+"PO-Revision-Date: 2010-12-16 00:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po
index 7f48f002e08..f7411ae0be7 100644
--- a/addons/purchase/i18n/nl.po
+++ b/addons/purchase/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-08-07 07:37+0000\n"
+"PO-Revision-Date: 2010-12-16 03:38+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot
index ce504eb4108..2e234b357e9 100644
--- a/addons/purchase/i18n/purchase.pot
+++ b/addons/purchase/i18n/purchase.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:25+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:25+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:14+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:14+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -267,6 +267,11 @@ msgstr ""
 msgid "Net Total :"
 msgstr ""
 
+#. module: purchase
+#: view:purchase.installer:0
+msgid "Configure Your Purchases Management Application"
+msgstr ""
+
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_product
 #: model:ir.ui.menu,name:purchase.menu_procurement_partner_contact_form
@@ -274,9 +279,8 @@ msgid "Products"
 msgstr ""
 
 #. module: purchase
-#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
-#: view:purchase.report:0
-msgid "Total Qty and Amount by month"
+#: field:purchase.installer,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
 #. module: purchase
@@ -552,10 +556,8 @@ msgid "Error !"
 msgstr ""
 
 #. module: purchase
-#: code:addons/purchase/purchase.py:0
-#, python-format
-msgid "You have to select a partner in the purchase form !\n"
-"Please set one partner before choosing a product."
+#: view:purchase.order.line:0
+msgid "General Information"
 msgstr ""
 
 #. module: purchase
@@ -720,8 +722,8 @@ msgid "This is computed as the minimum scheduled date of all purchase order line
 msgstr ""
 
 #. module: purchase
-#: field:purchase.installer,progress:0
-msgid "Configuration Progress"
+#: selection:purchase.report,month:0
+msgid "August"
 msgstr ""
 
 #. module: purchase
@@ -926,8 +928,8 @@ msgid "From the Purchase Orders menu, you can track the status of your orders: p
 msgstr ""
 
 #. module: purchase
-#: selection:purchase.report,month:0
-msgid "August"
+#: view:purchase.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: purchase
@@ -1133,12 +1135,13 @@ msgid "Default Purchase Pricelist Version"
 msgstr ""
 
 #. module: purchase
-#: view:purchase.order.line:0
-msgid "General Information"
+#: view:purchase.installer:0
+msgid "Extend your Purchases Management Application with additional functionalities."
 msgstr ""
 
 #. module: purchase
 #: model:ir.actions.act_window,name:purchase.action_purchase_install_module
+#: view:purchase.installer:0
 msgid "Purchases Application Configuration"
 msgstr ""
 
@@ -1378,6 +1381,12 @@ msgstr ""
 msgid "Reservation"
 msgstr ""
 
+#. module: purchase
+#: model:ir.actions.act_window,name:purchase.action_purchase_order_report_graph
+#: view:purchase.report:0
+msgid "Total Qty and Amount by month"
+msgstr ""
+
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
 #, python-format
@@ -1572,6 +1581,13 @@ msgstr ""
 msgid "Year"
 msgstr ""
 
+#. module: purchase
+#: code:addons/purchase/purchase.py:0
+#, python-format
+msgid "You have to select a partner in the purchase form !\n"
+"Please set one partner before choosing a product."
+msgstr ""
+
 #. module: purchase
 #: view:purchase.installer:0
 msgid "title"
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index ae8a7fcf276..cb8eeeb3859 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-09 08:00+0000\n"
+"PO-Revision-Date: 2010-12-15 08:26+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -1140,7 +1140,7 @@ msgstr "Комплектовочный лист создан для отслеж
 #. module: purchase
 #: model:ir.ui.menu,name:purchase.menu_purchase_deshboard
 msgid "Dashboard"
-msgstr "Панель"
+msgstr "Инф. панель"
 
 #. module: purchase
 #: view:purchase.report:0
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index 5342f8b1b97..12b45c9c7d2 100644
--- a/addons/purchase/i18n/tr.po
+++ b/addons/purchase/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-09-09 07:20+0000\n"
+"PO-Revision-Date: 2010-12-16 04:39+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po
index e23a4b6550f..05b8e8b4e5e 100644
--- a/addons/purchase/i18n/vi.po
+++ b/addons/purchase/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-01 07:27+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 15:26+0000\n"
+"Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -779,7 +779,7 @@ msgstr ""
 #: model:ir.ui.menu,name:purchase.menu_action_picking_tree_in_move
 #: model:ir.ui.menu,name:purchase.menu_procurement_management_inventory
 msgid "Receive Products"
-msgstr ""
+msgstr "Sản phẩm nhận được"
 
 #. module: purchase
 #: model:ir.model,name:purchase.model_procurement_order
@@ -1026,7 +1026,7 @@ msgstr "Tháng Mười một"
 #. module: purchase
 #: view:purchase.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Bộ lọc mở rộng..."
 
 #. module: purchase
 #: code:addons/purchase/purchase.py:0
@@ -1606,7 +1606,7 @@ msgstr ""
 #: view:purchase.order.line:0
 #: view:purchase.report:0
 msgid "Group By..."
-msgstr "Nhóm theo"
+msgstr "Nhóm theo..."
 
 #. module: purchase
 #: model:process.transition,name:purchase.process_transition_purchaseinvoice0
diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po
index 9bb3dc49a1f..2b355859fd1 100644
--- a/addons/purchase/i18n/zh_CN.po
+++ b/addons/purchase/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 17:28+0000\n"
-"Last-Translator: Roger Zeng <Unknown>\n"
+"PO-Revision-Date: 2010-12-16 04:25+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 927f1cdcba5..79bc59759ae 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -46,7 +46,7 @@ class purchase_order(osv.osv):
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
         cur_obj=self.pool.get('res.currency')
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             res[order.id] = {
                 'amount_untaxed': 0.0,
                 'amount_tax': 0.0,
@@ -67,7 +67,7 @@ class purchase_order(osv.osv):
         if not value: return False
         if type(ids)!=type([]):
             ids=[ids]
-        for po in self.browse(cr, uid, ids, context):
+        for po in self.browse(cr, uid, ids, context=context):
             cr.execute("""update purchase_order_line set
                     date_planned=%s
                 where
@@ -223,7 +223,7 @@ class purchase_order(osv.osv):
     _order = "name desc"
 
     def unlink(self, cr, uid, ids, context=None):
-        purchase_orders = self.read(cr, uid, ids, ['state'])
+        purchase_orders = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for s in purchase_orders:
             if s['state'] in ['draft','cancel']:
@@ -239,7 +239,7 @@ class purchase_order(osv.osv):
 
         return super(purchase_order, self).unlink(cr, uid, unlink_ids, context=context)
 
-    def button_dummy(self, cr, uid, ids, context={}):
+    def button_dummy(self, cr, uid, ids, context=None):
         return True
 
     def onchange_dest_address_id(self, cr, uid, ids, adr_id):
@@ -265,14 +265,14 @@ class purchase_order(osv.osv):
         fiscal_position = part.property_account_position and part.property_account_position.id or False
         return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}}
 
-    def wkf_approve_order(self, cr, uid, ids, context={}):
+    def wkf_approve_order(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')})
         return True
 
     #TODO: implement messages system
-    def wkf_confirm_order(self, cr, uid, ids, context={}):
+    def wkf_confirm_order(self, cr, uid, ids, context=None):
         todo = []
-        for po in self.browse(cr, uid, ids):
+        for po in self.browse(cr, uid, ids, context=context):
             if not po.order_line:
                 raise osv.except_osv(_('Error !'),_('You can not confirm purchase order without Purchase Order Lines.'))
             for line in po.order_line:
@@ -386,8 +386,8 @@ class purchase_order(osv.osv):
                     return True
         return False
 
-    def action_cancel(self, cr, uid, ids, context={}):
-        for purchase in self.browse(cr, uid, ids):
+    def action_cancel(self, cr, uid, ids, context=None):
+        for purchase in self.browse(cr, uid, ids, context=context):
             for pick in purchase.picking_ids:
                 if pick.state not in ('draft','cancel'):
                     raise osv.except_osv(
@@ -460,7 +460,7 @@ class purchase_order(osv.osv):
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
         return picking_id
 
-    def copy(self, cr, uid, id, default=None,context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
         default.update({
@@ -474,7 +474,7 @@ class purchase_order(osv.osv):
         return super(purchase_order, self).copy(cr, uid, id, default, context)
 
 
-    def do_merge(self, cr, uid, ids, context):
+    def do_merge(self, cr, uid, ids, context=None):
         """
         To merge similar type of purchase orders.
         Orders will only be merged if:
@@ -515,7 +515,7 @@ class purchase_order(osv.osv):
 
         new_orders = {}
 
-        for porder in [order for order in self.browse(cr, uid, ids) if order.state == 'draft']:
+        for porder in [order for order in self.browse(cr, uid, ids, context=context) if order.state == 'draft']:
             order_key = make_key(porder, ('partner_id', 'location_id', 'pricelist_id'))
             new_order = new_orders.setdefault(order_key, ({}, []))
             new_order[1].append(porder.id)
@@ -584,7 +584,7 @@ class purchase_order(osv.osv):
 purchase_order()
 
 class purchase_order_line(osv.osv):
-    def _amount_line(self, cr, uid, ids, prop, arg,context):
+    def _amount_line(self, cr, uid, ids, prop, arg, context=None):
         res = {}
         cur_obj=self.pool.get('res.currency')
         tax_obj = self.pool.get('account.tax')
@@ -629,7 +629,7 @@ class purchase_order_line(osv.osv):
     _name = 'purchase.order.line'
     _description = 'Purchase Order Line'
 
-    def copy_data(self, cr, uid, id, default=None,context={}):
+    def copy_data(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
         default.update({'state':'draft', 'move_ids':[],'invoiced':0,'invoice_lines':[]})
@@ -712,8 +712,8 @@ class purchase_order_line(osv.osv):
             res['value']['price_unit'] = 0.0
         return res
 
-    def action_confirm(self, cr, uid, ids, context={}):
-        self.write(cr, uid, ids, {'state': 'confirmed'}, context)
+    def action_confirm(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state': 'confirmed'}, context=context)
         return True
 
 purchase_order_line()
@@ -724,7 +724,7 @@ class procurement_order(osv.osv):
         'purchase_id': fields.many2one('purchase.order', 'Purchase Order'),
     }
 
-    def action_po_assign(self, cr, uid, ids, context={}):
+    def action_po_assign(self, cr, uid, ids, context=None):
         """ This is action which call from workflow to assign purchase order to procurements
         @return: True
         """
@@ -732,19 +732,21 @@ class procurement_order(osv.osv):
         res = res.values()
         return len(res) and res[0] or 0 #TO CHECK: why workflow is generated error if return not integer value
 
-    def make_po(self, cr, uid, ids, context={}):
+    def make_po(self, cr, uid, ids, context=None):
         """ Make purchase order from procurement
         @return: New created Purchase Orders procurement wise
         """
         res = {}
-        company = self.pool.get('res.users').browse(cr, uid, uid, context).company_id
+        if context is None:
+            context = {}
+        company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
         partner_obj = self.pool.get('res.partner')
         uom_obj = self.pool.get('product.uom')
         pricelist_obj = self.pool.get('product.pricelist')
         prod_obj = self.pool.get('product.product')
         acc_pos_obj = self.pool.get('account.fiscal.position')
         po_obj = self.pool.get('purchase.order')
-        for procurement in self.browse(cr, uid, ids):
+        for procurement in self.browse(cr, uid, ids, context=context):
             res_id = procurement.move_id.id
             partner = procurement.product_id.seller_id # Taken Main Supplier of Product of Procurement.
             seller_qty = procurement.product_id.seller_qty
diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py
index 93cd142ac01..0d82baa96aa 100644
--- a/addons/purchase/stock.py
+++ b/addons/purchase/stock.py
@@ -118,9 +118,11 @@ class stock_partial_picking(osv.osv_memory):
         @param context: A standard dictionary
         @return: A dictionary which of fields with values.
         """
+        if context is None:
+            context = {}
         pick_obj = self.pool.get('stock.picking')
         res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
-        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             has_product_cost = (pick.type == 'in' and pick.purchase_id)
             for m in pick.move_lines:
                 if m.state in ('done','cancel') :
@@ -144,9 +146,11 @@ class stock_partial_move(osv.osv_memory):
         @param context: A standard dictionary
         @return: A dictionary which of fields with values.
         """
+        if context is None:
+            context = {}
         res = super(stock_partial_move, self).default_get(cr, uid, fields, context=context)
         move_obj = self.pool.get('stock.move')
-        for m in move_obj.browse(cr, uid, context.get('active_ids', [])):
+        for m in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if m.picking_id.type == 'in' and m.product_id.cost_method == 'average' \
                 and m.purchase_line_id and m.picking_id.purchase_id:
                     # We use the original PO unit purchase price as the basis for the cost, expressed
diff --git a/addons/purchase/wizard/purchase_order_group.py b/addons/purchase/wizard/purchase_order_group.py
index 10bf55570cc..2496044a45e 100644
--- a/addons/purchase/wizard/purchase_order_group.py
+++ b/addons/purchase/wizard/purchase_order_group.py
@@ -40,14 +40,14 @@ class purchase_order_group(osv.osv_memory):
          @param context: A standard dictionary 
          @return: New arch of view.
         """
-        if not context:
+        if context is None:
             context={}
         res = super(purchase_order_group, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if context.get('active_model','') == 'purchase.order' and len(context['active_ids']) < 2:
             raise osv.except_osv(_('Warning'),
             _('Please select multiple order to merge in the list view.'))
         return res
-    def merge_orders(self, cr, uid, ids, context):
+    def merge_orders(self, cr, uid, ids, context=None):
         """
              To merge similar type of purchase orders.
 
@@ -62,6 +62,8 @@ class purchase_order_group(osv.osv_memory):
         """
         order_obj = self.pool.get('purchase.order')
         mod_obj =self.pool.get('ir.model.data')
+        if context is None:
+            context = {}
         result = mod_obj._get_id(cr, uid, 'purchase', 'view_purchase_order_filter')
         id = mod_obj.read(cr, uid, result, ['res_id'])
 
diff --git a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
index 3c8b9d63485..2b1f203ca37 100644
--- a/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
+++ b/addons/purchase_analytic_plans/i18n/purchase_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:26+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:15+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/purchase_requisition/i18n/purchase_requisition.pot b/addons/purchase_requisition/i18n/purchase_requisition.pot
index d08505dbf02..0606898063d 100644
--- a/addons/purchase_requisition/i18n/purchase_requisition.pot
+++ b/addons/purchase_requisition/i18n/purchase_requisition.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:26+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:15+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:15+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/purchase_requisition/purchase_requisition.py b/addons/purchase_requisition/purchase_requisition.py
index 206a14beab2..c3a35207aa4 100644
--- a/addons/purchase_requisition/purchase_requisition.py
+++ b/addons/purchase_requisition/purchase_requisition.py
@@ -52,7 +52,7 @@ class purchase_requisition(osv.osv):
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'purchase.order.requisition'),
     }
 
-    def copy(self, cr, uid, id, default=None,context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
         default.update({
@@ -63,7 +63,7 @@ class purchase_requisition(osv.osv):
         return super(purchase_requisition, self).copy(cr, uid, id, default, context)
     def tender_cancel(self, cr, uid, ids, context=None):
         purchase_order_obj = self.pool.get('purchase.order')
-        for purchase in self.browse(cr, uid, ids):
+        for purchase in self.browse(cr, uid, ids, context=context):
             for purchase_id in purchase.purchase_ids:
                 if str(purchase_id.state) in('draft','wait'):
                     purchase_order_obj.action_cancel(cr,uid,[purchase_id.id])
@@ -107,7 +107,7 @@ class purchase_requisition_line(osv.osv):
         """
         value = {'product_uom_id': ''}
         if product_id:
-            prod = self.pool.get('product.product').browse(cr, uid, [product_id])[0]
+            prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
             value = {'product_uom_id': prod.uom_id.id,'product_qty':1.0}
         return {'value': value}
 
@@ -121,10 +121,10 @@ class purchase_order(osv.osv):
     _columns = {
         'requisition_id' : fields.many2one('purchase.requisition','Purchase Requisition')
     }
-    def wkf_confirm_order(self, cr, uid, ids, context={}):
-        res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context)
+    def wkf_confirm_order(self, cr, uid, ids, context=None):
+        res = super(purchase_order, self).wkf_confirm_order(cr, uid, ids, context=context)
         proc_obj=self.pool.get('procurement.order')
-        for po in self.browse(cr, uid, ids, context):
+        for po in self.browse(cr, uid, ids, context=context):
             if po.requisition_id and (po.requisition_id.exclusive=='exclusive'):
                 for order in po.requisition_id.purchase_ids:
                     if order.id<>po.id:
@@ -160,7 +160,7 @@ class procurement_order(osv.osv):
         sequence_obj = self.pool.get('ir.sequence')
         res = super(procurement_order, self).make_po(cr, uid, ids, context=context)
         for proc_id, po_id in res.items():
-            procurement = self.browse(cr, uid, proc_id)
+            procurement = self.browse(cr, uid, proc_id, context=context)
             requisition_id=False
             if procurement.product_id.purchase_requisition:
                 requisition_id=self.pool.get('purchase.requisition').create(cr, uid, {
diff --git a/addons/purchase_requisition/wizard/purchase_requisition_partner.py b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
index a5a291b545d..d88ae8df725 100644
--- a/addons/purchase_requisition/wizard/purchase_requisition_partner.py
+++ b/addons/purchase_requisition/wizard/purchase_requisition_partner.py
@@ -35,9 +35,11 @@ class purchase_requisition_partner(osv.osv_memory):
     }
 
     def view_init(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         res = super(purchase_requisition_partner, self).view_init(cr, uid, fields_list, context=context)
         record_id = context and context.get('active_id', False) or False
-        tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id)
+        tender = self.pool.get('purchase.requisition').browse(cr, uid, record_id, context=context)
         if not tender.line_ids:
             raise osv.except_osv(_('Error!'), _('No Product in Tender'))
         True
@@ -49,7 +51,7 @@ class purchase_requisition_partner(osv.osv_memory):
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
         return {'value':{'partner_address_id': addr['default']}}
 
-    def create_order(self, cr, uid, ids, context):
+    def create_order(self, cr, uid, ids, context=None):
         """
              To Create a purchase orders .
 
@@ -61,6 +63,8 @@ class purchase_requisition_partner(osv.osv_memory):
              @return: {}
 
         """
+        if context is None:
+            context = {}
         record_ids = context and context.get('active_ids', False)
         if record_ids:
             data =  self.read(cr, uid, ids)
@@ -75,12 +79,12 @@ class purchase_requisition_partner(osv.osv_memory):
             acc_pos_obj = self.pool.get('account.fiscal.position')
             partner_id = data[0]['partner_id']
 
-            supplier_data = partner_obj.browse(cr, uid,[ partner_id])[0]
+            supplier_data = partner_obj.browse(cr, uid, partner_id, context=context)
 
             address_id = partner_obj.address_get(cr, uid, [partner_id], ['delivery'])['delivery']
             list_line=[]
             purchase_order_line={}
-            for tender in tender_obj.browse(cr, uid, record_ids):
+            for tender in tender_obj.browse(cr, uid, record_ids, context=context):
                 for line in tender.line_ids:
                     partner_list = sorted([(partner.sequence, partner) for partner in  line.product_id.seller_ids if partner])
                     partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
diff --git a/addons/report_designer/i18n/report_designer.pot b/addons/report_designer/i18n/report_designer.pot
index 13641b0652d..9b993d44581 100644
--- a/addons/report_designer/i18n/report_designer.pot
+++ b/addons/report_designer/i18n/report_designer.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:26+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:26+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:16+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,7 @@ msgstr ""
 
 #. module: report_designer
 #: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+#: view:report_designer.installer:0
 msgid "Reporting Tools Configuration"
 msgstr ""
 
@@ -26,8 +27,8 @@ msgid "Query Builder"
 msgstr ""
 
 #. module: report_designer
-#: field:report_designer.installer,progress:0
-msgid "Configuration Progress"
+#: view:report_designer.installer:0
+msgid "Configure"
 msgstr ""
 
 #. module: report_designer
@@ -56,9 +57,13 @@ msgid "Reporting Tools"
 msgstr ""
 
 #. module: report_designer
-#: model:ir.module.module,description:report_designer.module_meta_information
-msgid "Installer for reporting tools selection\n"
-"    "
+#: view:report_designer.installer:0
+msgid "OpenERP's built-in reporting abilities can be improved even further with some of the following applications"
+msgstr ""
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "Configure Reporting Tools"
 msgstr ""
 
 #. module: report_designer
@@ -66,3 +71,14 @@ msgstr ""
 msgid "Allows you to create any statistic reports  on several objects. It's a SQL query builder and browser for end users."
 msgstr ""
 
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid "Installer for reporting tools selection\n"
+"    "
+msgstr ""
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
diff --git a/addons/report_intrastat/i18n/pt.po b/addons/report_intrastat/i18n/pt.po
index 266f959f195..44ea2986f13 100644
--- a/addons/report_intrastat/i18n/pt.po
+++ b/addons/report_intrastat/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-10-30 09:03+0000\n"
+"PO-Revision-Date: 2010-12-15 13:07+0000\n"
 "Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/report_intrastat.pot b/addons/report_intrastat/i18n/report_intrastat.pot
index 82e72fa27f9..c2dcfd78499 100644
--- a/addons/report_intrastat/i18n/report_intrastat.pot
+++ b/addons/report_intrastat/i18n/report_intrastat.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:27+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:27+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:16+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:16+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/report_webkit/i18n/report_webkit.pot b/addons/report_webkit/i18n/report_webkit.pot
index 2f19a94427b..1f1e52ed9a5 100644
--- a/addons/report_webkit/i18n/report_webkit.pot
+++ b/addons/report_webkit/i18n/report_webkit.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:16:21+0000\n"
-"PO-Revision-Date: 2010-12-10 17:16:21+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:17+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/report_webkit/wizard/report_webkit_actions.py b/addons/report_webkit/wizard/report_webkit_actions.py
index 249dd0222d7..a287fd24906 100644
--- a/addons/report_webkit/wizard/report_webkit_actions.py
+++ b/addons/report_webkit/wizard/report_webkit_actions.py
@@ -85,7 +85,7 @@ class report_webkit_actions(osv.osv_memory):
         
         return res
 
-    def do_action(self, cr, uid, ids, context):
+    def do_action(self, cr, uid, ids, context=None):
         """ This Function Open added Action.
          @param self: The object pointer.
          @param cr: A database cursor
@@ -93,9 +93,11 @@ class report_webkit_actions(osv.osv_memory):
          @param ids: List of report.webkit.actions's ID
          @param context: A standard dictionary 
          @return: Dictionary of ir.values form.
-        """        
+        """
+        if context is None:
+            context = {}        
         report_obj = self.pool.get('ir.actions.report.xml')
-        for current in self.browse(cr, uid, ids):
+        for current in self.browse(cr, uid, ids, context=context):
             report = report_obj.browse(
                                                         cr, 
                                                         uid, 
diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po
index 35e6500bdc9..1d98e736ceb 100644
--- a/addons/report_webkit_sample/i18n/fr.po
+++ b/addons/report_webkit_sample/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 21:52+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-15 20:59+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_webkit_sample
@@ -24,7 +25,7 @@ msgstr "facture WebKit"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Facture fournisseur"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
@@ -45,6 +46,16 @@ msgid ""
 "        http://files.me.com/nbessi/06n92k.mov \n"
 "                    "
 msgstr ""
+"Exemples pour le moteur de rapport Webkit (module report_webkit).\n"
+"\n"
+"    Un exemple de rapport de facture est inclus dans ce module, tout comme "
+"un assistant pour\n"
+"    ajouter une entrée de rapport Webkit sur tout document dans le système.\n"
+"      \n"
+"    Vous avez la possibilité de créer des boutons d'impression en appelant "
+"l'assistant. Pour plus de détails, regardez:\n"
+"        http://files.me.com/nbessi/06n92k.mov \n"
+"                    "
 
 #. module: report_webkit_sample
 #: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
@@ -59,7 +70,7 @@ msgstr "Disc.(%)"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
@@ -89,7 +100,7 @@ msgstr "QTÉ"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Base"
-msgstr ""
+msgstr "Base"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
@@ -104,27 +115,27 @@ msgstr "Impôts"
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "VAT"
-msgstr ""
+msgstr "TVA"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Refund"
-msgstr ""
+msgstr "Remboursement"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Tel"
-msgstr ""
+msgstr "Tél"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "E-mail"
-msgstr ""
+msgstr "Courriel"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
 msgid "Invoice"
-msgstr ""
+msgstr "Facture"
 
 #. module: report_webkit_sample
 #: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
diff --git a/addons/report_webkit_sample/i18n/report_webkit_sample.pot b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
index 7087692979d..1e1573e7125 100644
--- a/addons/report_webkit_sample/i18n/report_webkit_sample.pot
+++ b/addons/report_webkit_sample/i18n/report_webkit_sample.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:28+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:17+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/resource/i18n/de.po b/addons/resource/i18n/de.po
index 0a9573096cb..cd42dd46c8d 100644
--- a/addons/resource/i18n/de.po
+++ b/addons/resource/i18n/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-12-01 07:43+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-02 04:50+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -28,22 +28,9 @@ msgstr ""
 "definiert, dann gilt der Feiertag nur für diese Ressource"
 
 #. module: resource
-#: selection:resource.resource,resource_type:0
-msgid "Material"
-msgstr "Material"
-
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
-"beinhalten!"
-
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ungültiger Modellname in der Aktionsdefinition."
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Freitag"
 
 #. module: resource
 #: field:resource.resource,resource_type:0
@@ -62,6 +49,7 @@ msgid "Resources Leaves"
 msgstr "Abwesende Ressourcen"
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -69,11 +57,6 @@ msgstr "Abwesende Ressourcen"
 msgid "Working Time"
 msgstr "Arbeitszeit"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter XML-Code für diese Ansicht!"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -90,11 +73,6 @@ msgstr "Gruppiert nach..."
 msgid "Sunday"
 msgstr "Sonntag"
 
-#. module: resource
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -112,19 +90,19 @@ msgid "Resources"
 msgstr "Ressourcen"
 
 #. module: resource
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Abteilungsleiter"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
-msgstr "Suche Arbeitsperiode"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Montag"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -141,9 +119,9 @@ msgid "Company"
 msgstr "Mandant"
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Friday"
-msgstr "Freitag"
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Material"
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
@@ -155,6 +133,11 @@ msgstr "Wochentag"
 msgid "Starting date"
 msgstr "Anfangsdatum"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -216,15 +199,6 @@ msgstr "Ressource"
 msgid "Name"
 msgstr "Bezeichnung"
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-"Wenn das Aktiv Feld auf Falsch gesetzt wird, wird die Ressource versteckt "
-"ohne sie zu löschen"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -232,7 +206,6 @@ msgstr "Mittwoch"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Arbeits-/Bürozeiten"
 
@@ -246,6 +219,13 @@ msgstr "Ressource Detail"
 msgid "Active"
 msgstr "Aktiv"
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -262,11 +242,6 @@ msgstr ""
 msgid "Define the schedule of resource"
 msgstr "Definire den Einsatzplan für diese Ressource"
 
-#. module: resource
-#: field:resource.calendar.attendance,hour_to:0
-msgid "Work to"
-msgstr "Arbeitszeit bis"
-
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
@@ -278,9 +253,14 @@ msgid "Code"
 msgstr "Code"
 
 #. module: resource
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Montag"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Arbeitszeit bis"
 
 #. module: resource
 #: help:resource.resource,time_efficiency:0
@@ -302,11 +282,6 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#. module: resource
-#: field:resource.calendar,manager:0
-msgid "Workgroup manager"
-msgstr "Abteilungsleiter"
-
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 #: field:resource.resource,calendar_id:0
@@ -324,6 +299,11 @@ msgstr "Ressource Abwesenheiten"
 msgid "General Information"
 msgstr "Generelle Information"
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -366,10 +346,39 @@ msgstr " (copy)"
 msgid "Saturday"
 msgstr "Samstag"
 
-#. module: resource
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Der Objektname muss mit \"x_\" beginnen und darf keine Sonderzeichen "
+#~ "beinhalten!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modellname in der Aktionsdefinition."
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the resource "
+#~ "record without removing it."
+#~ msgstr ""
+#~ "Wenn das Aktiv Feld auf Falsch gesetzt wird, wird die Ressource versteckt "
+#~ "ohne sie zu löschen"
 
 #~ msgid "Manager"
 #~ msgstr "Manager"
+
+#~ msgid "Search Working Period"
+#~ msgstr "Suche Arbeitsperiode"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler ! Sie können kein rekursives Menü erstellen."
diff --git a/addons/resource/i18n/es.po b/addons/resource/i18n/es.po
index d27c46973ef..75c7baa145d 100644
--- a/addons/resource/i18n/es.po
+++ b/addons/resource/i18n/es.po
@@ -7,15 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-09 11:03+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-15 23:19+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -49,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Ausencias recursos"
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -94,9 +94,9 @@ msgid "Workgroup manager"
 msgstr "Responsable del grupo de trabajo"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
-msgstr "Buscar periodo de trabajo"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr "El horario de trabajo empezará desde"
 
 #. module: resource
 #: constraint:resource.calendar.leaves:0
@@ -134,6 +134,11 @@ msgstr "Día de la semana"
 msgid "Starting date"
 msgstr "Fecha de inicio"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr "Buscar horario de trabajo"
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -202,7 +207,6 @@ msgstr "Miércoles"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Horario de trabajo"
 
@@ -295,6 +299,11 @@ msgstr "Ausencias recursos"
 msgid "General Information"
 msgstr "Información general"
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr "El horario de trabajo terminará a"
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -360,3 +369,6 @@ msgstr "Sábado"
 
 #~ msgid "Size of the field can never be less than 1 !"
 #~ msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
+
+#~ msgid "Search Working Period"
+#~ msgstr "Buscar periodo de trabajo"
diff --git a/addons/resource/i18n/et.po b/addons/resource/i18n/et.po
index 87a4fc354bc..99e1163affb 100644
--- a/addons/resource/i18n/et.po
+++ b/addons/resource/i18n/et.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-08-28 08:21+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -29,13 +29,6 @@ msgstr ""
 msgid "Friday"
 msgstr "Reede"
 
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
-
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
@@ -53,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -60,11 +54,6 @@ msgstr ""
 msgid "Working Time"
 msgstr "Tööaeg"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -81,11 +70,6 @@ msgstr ""
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Vigane mudeli nimi toimingu definitsioonis."
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -108,14 +92,14 @@ msgid "Workgroup manager"
 msgstr "Töörühma juhataja"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Esmaspäev"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -146,6 +130,11 @@ msgstr "Nädalapäev"
 msgid "Starting date"
 msgstr "Alustamise kuupäev"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -167,6 +156,14 @@ msgstr "Kuupäev"
 msgid "Search Working Period Leaves"
 msgstr ""
 
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
@@ -179,6 +176,7 @@ msgstr "Sulgemise päevad"
 
 #. module: resource
 #: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
 #: view:resource.calendar.leaves:0
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
@@ -194,13 +192,6 @@ msgstr "Ressurss"
 msgid "Name"
 msgstr "Nimi"
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -208,7 +199,6 @@ msgstr "Kolmapäev"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Tööaeg"
 
@@ -222,6 +212,13 @@ msgstr ""
 msgid "Active"
 msgstr "Aktiivne"
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -247,6 +244,11 @@ msgstr "Töötab alates"
 msgid "Code"
 msgstr "Kood"
 
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Esmaspäev"
+
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
@@ -274,6 +276,7 @@ msgstr "Tööaeg"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
 msgstr ""
 
@@ -282,6 +285,11 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -324,5 +332,16 @@ msgstr ""
 msgid "Saturday"
 msgstr "Laupäev"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Vigane XML vaate arhitektuurile!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
 #~ msgid "Manager"
 #~ msgstr "Haldur"
diff --git a/addons/resource/i18n/fr.po b/addons/resource/i18n/fr.po
index 4395b799827..286a4c02d50 100644
--- a/addons/resource/i18n/fr.po
+++ b/addons/resource/i18n/fr.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-11-30 16:32+0000\n"
 "Last-Translator: Numérigraphe <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-01 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -24,20 +24,9 @@ msgid ""
 msgstr ""
 
 #. module: resource
-#: selection:resource.resource,resource_type:0
-msgid "Material"
-msgstr ""
-
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Vendredi"
 
 #. module: resource
 #: field:resource.resource,resource_type:0
@@ -56,6 +45,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -63,11 +53,6 @@ msgstr ""
 msgid "Working Time"
 msgstr "Temps de travail"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -84,11 +69,6 @@ msgstr ""
 msgid "Sunday"
 msgstr "Dimanche"
 
-#. module: resource
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr ""
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -106,19 +86,19 @@ msgid "Resources"
 msgstr ""
 
 #. module: resource
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Lundi"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -135,9 +115,9 @@ msgid "Company"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Friday"
-msgstr "Vendredi"
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr ""
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
@@ -149,6 +129,11 @@ msgstr "Jour de la semaine"
 msgid "Starting date"
 msgstr "Date début"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -206,13 +191,6 @@ msgstr ""
 msgid "Name"
 msgstr "Nom"
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -220,7 +198,6 @@ msgstr "Mercredi"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Période de travail"
 
@@ -234,6 +211,13 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -249,11 +233,6 @@ msgstr ""
 msgid "Define the schedule of resource"
 msgstr ""
 
-#. module: resource
-#: field:resource.calendar.attendance,hour_to:0
-msgid "Work to"
-msgstr ""
-
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
@@ -265,8 +244,13 @@ msgid "Code"
 msgstr ""
 
 #. module: resource
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Lundi"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
 msgstr ""
 
 #. module: resource
@@ -283,11 +267,6 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Mardi"
 
-#. module: resource
-#: field:resource.calendar,manager:0
-msgid "Workgroup manager"
-msgstr ""
-
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 #: field:resource.resource,calendar_id:0
@@ -305,6 +284,11 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -347,7 +331,5 @@ msgstr ""
 msgid "Saturday"
 msgstr "Samedi"
 
-#. module: resource
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr ""
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/resource/i18n/hr.po b/addons/resource/i18n/hr.po
index 9df09ab38f2..d5642d49849 100644
--- a/addons/resource/i18n/hr.po
+++ b/addons/resource/i18n/hr.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-09-10 16:28+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -29,12 +29,6 @@ msgstr ""
 msgid "Friday"
 msgstr ""
 
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
@@ -52,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -59,11 +54,6 @@ msgstr ""
 msgid "Working Time"
 msgstr ""
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -80,11 +70,6 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -107,13 +92,13 @@ msgid "Workgroup manager"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
 msgstr ""
 
 #. module: resource
@@ -145,6 +130,11 @@ msgstr ""
 msgid "Starting date"
 msgstr ""
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -166,6 +156,14 @@ msgstr ""
 msgid "Search Working Period Leaves"
 msgstr ""
 
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
@@ -178,6 +176,7 @@ msgstr ""
 
 #. module: resource
 #: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
 #: view:resource.calendar.leaves:0
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
@@ -193,13 +192,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -207,7 +199,6 @@ msgstr ""
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr ""
 
@@ -221,6 +212,13 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -246,6 +244,11 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
@@ -273,6 +276,7 @@ msgstr ""
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
 msgstr ""
 
@@ -281,6 +285,11 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
diff --git a/addons/resource/i18n/it.po b/addons/resource/i18n/it.po
index e2cb9504c99..92e2ba38842 100644
--- a/addons/resource/i18n/it.po
+++ b/addons/resource/i18n/it.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-11-18 16:13+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-11-29 07:52+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-30 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -27,22 +27,9 @@ msgstr ""
 "ferie/permessi relativi a quanto selezionato"
 
 #. module: resource
-#: selection:resource.resource,resource_type:0
-msgid "Material"
-msgstr "Materiale"
-
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Il nome dell'oggetto deve cominciare con \"x_\" e non contenere caratteri "
-"speciali!"
-
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome del modello non valido nella definizione dell'azione"
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Friday"
+msgstr "Venerdì"
 
 #. module: resource
 #: field:resource.resource,resource_type:0
@@ -61,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Permessi"
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -68,11 +56,6 @@ msgstr "Permessi"
 msgid "Working Time"
 msgstr "Tempo di lavoro"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -89,11 +72,6 @@ msgstr "Raggruppato per..."
 msgid "Sunday"
 msgstr "Domenica"
 
-#. module: resource
-#: constraint:ir.ui.menu:0
-msgid "Error ! You can not create recursive Menu."
-msgstr "Errore ! Non è possibile creare menu ricorsivi."
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -111,19 +89,19 @@ msgid "Resources"
 msgstr "Risorse"
 
 #. module: resource
-#: sql_constraint:ir.module.module:0
-msgid "The certificate ID of the module must be unique !"
-msgstr "L'ID del certificato del modulo deve essere unico!"
+#: field:resource.calendar,manager:0
+msgid "Workgroup manager"
+msgstr "Responsabile Gruppo di Lavoro"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
-msgstr "Ricerca periodo di lavoro"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Lunedì"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -140,9 +118,9 @@ msgid "Company"
 msgstr "Azienda"
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Friday"
-msgstr "Venerdì"
+#: selection:resource.resource,resource_type:0
+msgid "Material"
+msgstr "Materiale"
 
 #. module: resource
 #: field:resource.calendar.attendance,dayofweek:0
@@ -154,6 +132,11 @@ msgstr "Giorno della settimana"
 msgid "Starting date"
 msgstr "Data di inizio"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -214,15 +197,6 @@ msgstr "Risorsa"
 msgid "Name"
 msgstr "Nome"
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-"Il camp 'attivo' permette di noscondere il record della risorsa senza "
-"eliminarlo."
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -230,7 +204,6 @@ msgstr "Mercoledì"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Periodo lavorativo"
 
@@ -244,6 +217,13 @@ msgstr "Dettaglio risorsa"
 msgid "Active"
 msgstr "Attivo"
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -259,11 +239,6 @@ msgstr "Nome utente per controllare accessi per la risorsa"
 msgid "Define the schedule of resource"
 msgstr "Definire il piano di lavoro per la risorsa"
 
-#. module: resource
-#: field:resource.calendar.attendance,hour_to:0
-msgid "Work to"
-msgstr "Lavoro fino a"
-
 #. module: resource
 #: field:resource.calendar.attendance,hour_from:0
 msgid "Work from"
@@ -275,9 +250,14 @@ msgid "Code"
 msgstr "Codice"
 
 #. module: resource
-#: sql_constraint:ir.module.module:0
-msgid "The name of the module must be unique !"
-msgstr "Il nome del modulo deve essere unico !"
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Lunedì"
+
+#. module: resource
+#: field:resource.calendar.attendance,hour_to:0
+msgid "Work to"
+msgstr "Lavoro fino a"
 
 #. module: resource
 #: help:resource.resource,time_efficiency:0
@@ -293,11 +273,6 @@ msgstr ""
 msgid "Tuesday"
 msgstr "Martedì"
 
-#. module: resource
-#: field:resource.calendar,manager:0
-msgid "Workgroup manager"
-msgstr "Responsabile Gruppo di Lavoro"
-
 #. module: resource
 #: field:resource.calendar.leaves,calendar_id:0
 #: field:resource.resource,calendar_id:0
@@ -315,6 +290,11 @@ msgstr "Permessi"
 msgid "General Information"
 msgstr "Informazioni Generali"
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -357,7 +337,36 @@ msgstr " (copia)"
 msgid "Saturday"
 msgstr "Sabato"
 
-#. module: resource
-#: sql_constraint:ir.model.fields:0
-msgid "Size of the field can never be less than 1 !"
-msgstr "La dimensione del campo non può mai essere minore di 1!"
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Il nome dell'oggetto deve cominciare con \"x_\" e non contenere caratteri "
+#~ "speciali!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML non valido per la struttura della vista"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome del modello non valido nella definizione dell'azione"
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Errore ! Non è possibile creare menu ricorsivi."
+
+#~ msgid "Search Working Period"
+#~ msgstr "Ricerca periodo di lavoro"
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "L'ID del certificato del modulo deve essere unico!"
+
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the resource "
+#~ "record without removing it."
+#~ msgstr ""
+#~ "Il camp 'attivo' permette di noscondere il record della risorsa senza "
+#~ "eliminarlo."
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Il nome del modulo deve essere unico !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "La dimensione del campo non può mai essere minore di 1!"
diff --git a/addons/resource/i18n/mn.po b/addons/resource/i18n/mn.po
index cff22c1ea43..076dea4aa2d 100644
--- a/addons/resource/i18n/mn.po
+++ b/addons/resource/i18n/mn.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-09-29 11:13+0000\n"
 "Last-Translator: ub121 <ubs121@gmail.com>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -31,14 +31,6 @@ msgstr ""
 msgid "Friday"
 msgstr "Баасан"
 
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
-
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
@@ -56,6 +48,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -63,11 +56,6 @@ msgstr ""
 msgid "Working Time"
 msgstr "Ажлын цаг"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -84,11 +72,6 @@ msgstr "Бүлэглэх..."
 msgid "Sunday"
 msgstr "Ням"
 
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -111,14 +94,14 @@ msgid "Workgroup manager"
 msgstr "Ажлын багийн менежер"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
-msgstr "Ажлын мөчлөг хайх"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Даваа"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -149,6 +132,11 @@ msgstr "Гариг"
 msgid "Starting date"
 msgstr "Эхлэл огноо"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -170,6 +158,14 @@ msgstr "Огноо"
 msgid "Search Working Period Leaves"
 msgstr ""
 
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
@@ -182,6 +178,7 @@ msgstr ""
 
 #. module: resource
 #: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
 #: view:resource.calendar.leaves:0
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
@@ -197,14 +194,6 @@ msgstr "Нөөц"
 msgid "Name"
 msgstr "Нэр"
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-"Хэрэв идэвхитэй талбарт чагт тависан бол нөөцийг хасалгүйгээр нуух болно."
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -212,7 +201,6 @@ msgstr "Лхагва"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Ажлын мөчлөг"
 
@@ -226,6 +214,13 @@ msgstr "Нөөцийн дэлгэрэнгүй"
 msgid "Active"
 msgstr "Идэвхтэй"
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -251,6 +246,11 @@ msgstr ""
 msgid "Code"
 msgstr "Код"
 
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Даваа"
+
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
@@ -278,6 +278,7 @@ msgstr "Ажлын цаг"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
 msgstr ""
 
@@ -286,6 +287,11 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -328,6 +334,21 @@ msgstr ""
 msgid "Saturday"
 msgstr "Бямба"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+#~ "болохгүй!"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Дэлгэцийн XML алдаатай!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#~ msgid "Search Working Period"
+#~ msgstr "Ажлын мөчлөг хайх"
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for resource management\n"
@@ -347,5 +368,11 @@ msgstr "Бямба"
 #~ "\n"
 #~ "    "
 
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the resource "
+#~ "record without removing it."
+#~ msgstr ""
+#~ "Хэрэв идэвхитэй талбарт чагт тависан бол нөөцийг хасалгүйгээр нуух болно."
+
 #~ msgid "Manager"
 #~ msgstr "Менежер"
diff --git a/addons/resource/i18n/nl.po b/addons/resource/i18n/nl.po
index 47f6f100b71..14e51d97b45 100644
--- a/addons/resource/i18n/nl.po
+++ b/addons/resource/i18n/nl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-10-12 07:44+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -31,13 +31,6 @@ msgstr ""
 msgid "Friday"
 msgstr "Vrijdag"
 
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
-
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
@@ -55,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Afwezigheid resource"
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -62,11 +56,6 @@ msgstr "Afwezigheid resource"
 msgid "Working Time"
 msgstr "Gewerkte tijd"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave opbouw!"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -83,11 +72,6 @@ msgstr "Groepeer op.."
 msgid "Sunday"
 msgstr "Zondag"
 
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -110,14 +94,14 @@ msgid "Workgroup manager"
 msgstr "Manager"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
-msgstr "Zoek werkperiode"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Maandag"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -148,6 +132,11 @@ msgstr "Dag v/d week"
 msgid "Starting date"
 msgstr "Startdatum"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -169,6 +158,14 @@ msgstr "Datum"
 msgid "Search Working Period Leaves"
 msgstr "Zoek afwezigheid werkperiode"
 
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
@@ -181,6 +178,7 @@ msgstr "Dagen gesloten"
 
 #. module: resource
 #: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
 #: view:resource.calendar.leaves:0
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
@@ -196,15 +194,6 @@ msgstr "Resource"
 msgid "Name"
 msgstr "Naam"
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-"Als het actief veld is aan staat, kunt u de resource verbergen zonder haar "
-"te verwijderen."
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -212,7 +201,6 @@ msgstr "Woensdag"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Werkperiode"
 
@@ -226,6 +214,13 @@ msgstr "Resource detail"
 msgid "Active"
 msgstr "Actief"
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -252,6 +247,11 @@ msgstr "Werk vanaf"
 msgid "Code"
 msgstr "Code"
 
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Maandag"
+
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
@@ -283,6 +283,7 @@ msgstr "Werktijd"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
 msgstr "Afwezigheid resource"
 
@@ -291,6 +292,11 @@ msgstr "Afwezigheid resource"
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -333,6 +339,20 @@ msgstr ""
 msgid "Saturday"
 msgstr "Zaterdag"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ongeldige XML voor weergave opbouw!"
+
+#~ msgid "Search Working Period"
+#~ msgstr "Zoek werkperiode"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ongeldige modelnaam in de definitie van de actie."
+
 #~ msgid ""
 #~ "\n"
 #~ "    Module for resource management\n"
@@ -353,5 +373,12 @@ msgstr "Zaterdag"
 #~ "\n"
 #~ "    "
 
+#~ msgid ""
+#~ "If the active field is set to true, it will allow you to hide the resource "
+#~ "record without removing it."
+#~ msgstr ""
+#~ "Als het actief veld is aan staat, kunt u de resource verbergen zonder haar "
+#~ "te verwijderen."
+
 #~ msgid "Manager"
 #~ msgstr "Manager"
diff --git a/addons/resource/i18n/pl.po b/addons/resource/i18n/pl.po
index a60334c32cd..131e6038e7c 100644
--- a/addons/resource/i18n/pl.po
+++ b/addons/resource/i18n/pl.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-08-22 05:49+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -31,14 +31,6 @@ msgstr ""
 msgid "Friday"
 msgstr "Piątek"
 
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
-"specjalnych !"
-
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
@@ -56,6 +48,7 @@ msgid "Resources Leaves"
 msgstr "Nieobecności zasobu"
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -63,11 +56,6 @@ msgstr "Nieobecności zasobu"
 msgid "Working Time"
 msgstr "Czas pracy"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -84,11 +72,6 @@ msgstr "Grupuj wg..."
 msgid "Sunday"
 msgstr "Niedziela"
 
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -111,14 +94,14 @@ msgid "Workgroup manager"
 msgstr "Kierownik grupy"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
-msgstr "Szukaj okresu pracy"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
+msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Poniedziałek"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -149,6 +132,11 @@ msgstr "Dzień tygodnia"
 msgid "Starting date"
 msgstr "Data rozpoczęcia"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -170,6 +158,14 @@ msgstr "Data"
 msgid "Search Working Period Leaves"
 msgstr "Szukaj nieobecności w okresie pracy"
 
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
@@ -182,6 +178,7 @@ msgstr "Dni zamknięcia"
 
 #. module: resource
 #: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
 #: view:resource.calendar.leaves:0
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
@@ -197,13 +194,6 @@ msgstr "Zasób"
 msgid "Name"
 msgstr "Nazwa"
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -211,7 +201,6 @@ msgstr "Środa"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Godziny pracy"
 
@@ -225,6 +214,13 @@ msgstr "Szczegóły zasobu"
 msgid "Active"
 msgstr "Aktywne"
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -250,6 +246,11 @@ msgstr "Pracuje od"
 msgid "Code"
 msgstr "Kod"
 
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Poniedziałek"
+
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
@@ -277,6 +278,7 @@ msgstr "Czas pracy"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
 msgstr "Niebecności zasobu"
 
@@ -285,6 +287,11 @@ msgstr "Niebecności zasobu"
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
@@ -327,5 +334,20 @@ msgstr ""
 msgid "Saturday"
 msgstr "Sobota"
 
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+#~ "specjalnych !"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#~ msgid "Search Working Period"
+#~ msgstr "Szukaj okresu pracy"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
 #~ msgid "Manager"
 #~ msgstr "Menedżer"
diff --git a/addons/resource/i18n/pt.po b/addons/resource/i18n/pt.po
index e3e2932f527..2b11955bdae 100644
--- a/addons/resource/i18n/pt.po
+++ b/addons/resource/i18n/pt.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-12-09 10:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-11 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -91,8 +92,8 @@ msgid "Workgroup manager"
 msgstr "Gestor do grupo de trabalho"
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
 msgstr ""
 
 #. module: resource
@@ -129,6 +130,11 @@ msgstr "Dia da semana"
 msgid "Starting date"
 msgstr "Data de inicio"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -193,7 +199,6 @@ msgstr "Quarta-Feira"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Horário de trabalho"
 
@@ -280,6 +285,11 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
diff --git a/addons/resource/i18n/resource.pot b/addons/resource/i18n/resource.pot
index 8e2da3bcf83..b7a7a475211 100644
--- a/addons/resource/i18n/resource.pot
+++ b/addons/resource/i18n/resource.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:28+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:28+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:17+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:17+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -42,6 +42,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -87,8 +88,8 @@ msgid "Workgroup manager"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Time"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
 msgstr ""
 
 #. module: resource
@@ -125,6 +126,11 @@ msgstr ""
 msgid "Starting date"
 msgstr ""
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -186,8 +192,7 @@ msgstr ""
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
-msgid "Working Time"
+msgid "Working Period"
 msgstr ""
 
 #. module: resource
@@ -267,6 +272,11 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
diff --git a/addons/resource/i18n/ru.po b/addons/resource/i18n/ru.po
index d8d442485f9..2596821d5c7 100644
--- a/addons/resource/i18n/ru.po
+++ b/addons/resource/i18n/ru.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
 "PO-Revision-Date: 2010-10-29 09:39+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -29,12 +29,6 @@ msgstr ""
 msgid "Friday"
 msgstr "Пятница"
 
-#. module: resource
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
 #. module: resource
 #: field:resource.resource,resource_type:0
 msgid "Resource Type"
@@ -52,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -59,11 +54,6 @@ msgstr ""
 msgid "Working Time"
 msgstr "Рабочее время"
 
-#. module: resource
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Thursday"
@@ -80,11 +70,6 @@ msgstr "Объединять по..."
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#. module: resource
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
 #. module: resource
 #: view:resource.resource:0
 msgid "Search Resource"
@@ -107,14 +92,14 @@ msgid "Workgroup manager"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
 msgstr ""
 
 #. module: resource
-#: selection:resource.calendar.attendance,dayofweek:0
-msgid "Monday"
-msgstr "Понедельник"
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
 
 #. module: resource
 #: model:ir.model,name:resource.model_resource_calendar
@@ -145,6 +130,11 @@ msgstr "День недели"
 msgid "Starting date"
 msgstr ""
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -166,6 +156,14 @@ msgstr "Дата"
 msgid "Search Working Period Leaves"
 msgstr ""
 
+#. module: resource
+#: model:ir.actions.act_window,help:resource.action_resource_resource_tree
+msgid ""
+"Resources allows you to create and manage resources that should be involved "
+"in a specific project phase. It also allows you to set their efficiency "
+"level and workload based on their weekly working hours"
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.leaves,date_to:0
 msgid "End Date"
@@ -178,6 +176,7 @@ msgstr ""
 
 #. module: resource
 #: model:ir.module.module,shortdesc:resource.module_meta_information
+#: model:ir.ui.menu,name:resource.menu_resource_config
 #: view:resource.calendar.leaves:0
 #: field:resource.calendar.leaves,resource_id:0
 #: view:resource.resource:0
@@ -193,13 +192,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: resource
-#: help:resource.resource,active:0
-msgid ""
-"If the active field is set to true, it will allow you to hide the resource "
-"record without removing it."
-msgstr ""
-
 #. module: resource
 #: selection:resource.calendar.attendance,dayofweek:0
 msgid "Wednesday"
@@ -207,7 +199,6 @@ msgstr "Среда"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr ""
 
@@ -221,6 +212,13 @@ msgstr ""
 msgid "Active"
 msgstr ""
 
+#. module: resource
+#: help:resource.resource,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the resource "
+"record without removing it."
+msgstr ""
+
 #. module: resource
 #: field:resource.calendar.attendance,calendar_id:0
 msgid "Resource's Calendar"
@@ -246,6 +244,11 @@ msgstr ""
 msgid "Code"
 msgstr ""
 
+#. module: resource
+#: selection:resource.calendar.attendance,dayofweek:0
+msgid "Monday"
+msgstr "Понедельник"
+
 #. module: resource
 #: field:resource.calendar.attendance,hour_to:0
 msgid "Work to"
@@ -273,6 +276,7 @@ msgstr ""
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree
+#: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search
 msgid "Resource Leaves"
 msgstr ""
 
@@ -281,6 +285,11 @@ msgstr ""
 msgid "General Information"
 msgstr ""
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
diff --git a/addons/resource/i18n/sv.po b/addons/resource/i18n/sv.po
index 68d5c0ee7f9..ddf16cdf1dc 100644
--- a/addons/resource/i18n/sv.po
+++ b/addons/resource/i18n/sv.po
@@ -7,14 +7,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-12 14:12+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"POT-Creation-Date: 2010-12-15 15:06+0000\n"
+"PO-Revision-Date: 2010-12-15 15:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: resource
@@ -46,6 +46,7 @@ msgid "Resources Leaves"
 msgstr ""
 
 #. module: resource
+#: view:resource.calendar:0
 #: field:resource.calendar,attendance_ids:0
 #: view:resource.calendar.attendance:0
 #: view:resource.calendar.leaves:0
@@ -91,8 +92,8 @@ msgid "Workgroup manager"
 msgstr ""
 
 #. module: resource
-#: view:resource.calendar:0
-msgid "Search Working Period"
+#: help:resource.calendar.attendance,hour_from:0
+msgid "Working time will start from"
 msgstr ""
 
 #. module: resource
@@ -129,6 +130,11 @@ msgstr "Veckodag"
 msgid "Starting date"
 msgstr "Startdatum"
 
+#. module: resource
+#: view:resource.calendar:0
+msgid "Search Working Time"
+msgstr ""
+
 #. module: resource
 #: view:resource.calendar.leaves:0
 msgid "Reason"
@@ -193,7 +199,6 @@ msgstr "Onsdag"
 
 #. module: resource
 #: model:ir.actions.act_window,name:resource.action_resource_calendar_form
-#: view:resource.calendar:0
 msgid "Working Period"
 msgstr "Arbetsperiod"
 
@@ -280,6 +285,11 @@ msgstr ""
 msgid "General Information"
 msgstr "Allmän information"
 
+#. module: resource
+#: help:resource.calendar.attendance,hour_to:0
+msgid "Working time will end at"
+msgstr ""
+
 #. module: resource
 #: view:resource.resource:0
 msgid "Inactive"
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 5c3ec8bacb8..19ece464eaf 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -250,8 +250,6 @@ class resource_resource(osv.osv):
         """
         Return a list of  Resource Class objects for the resources allocated to the phase.
         """
-        if context is None:
-            context = {}
         resource_objs = []
         user_pool = self.pool.get('res.users')
         for user in user_pool.browse(cr, uid, user_ids, context=context):
@@ -281,8 +279,6 @@ class resource_resource(osv.osv):
         @param resource_id : resource working on phase/task
         @param resource_calendar : working calendar of the resource
         """
-        if context is None:
-            context = {}
         resource_calendar_leaves_pool = self.pool.get('resource.calendar.leaves')
         leave_list = []
         if resource_id:
@@ -308,8 +304,6 @@ class resource_resource(osv.osv):
         Change the format of working calendar from 'Openerp' format to bring it into 'Faces' format.
         @param calendar_id : working calendar of the project
         """
-        if context is None:
-            context = {}
         resource_attendance_pool = self.pool.get('resource.calendar.attendance')
         time_range = "8:00-8:00"
         non_working = ""
@@ -364,7 +358,7 @@ class resource_calendar_leaves(osv.osv):
         'resource_id' : fields.many2one("resource.resource", "Resource", help="If empty, this is a generic holiday for the company. If a resource is set, the holiday/leave is only for this resource"),
     }
 
-    def check_dates(self, cr, uid, ids, context={}):
+    def check_dates(self, cr, uid, ids, context=None):
          leave = self.read(cr, uid, ids[0], ['date_from', 'date_to'])
          if leave['date_from'] and leave['date_to']:
              if leave['date_from'] > leave['date_to']:
@@ -379,7 +373,7 @@ class resource_calendar_leaves(osv.osv):
         result = {}
         if resource:
             resource_pool = self.pool.get('resource.resource')
-            result['calendar_id'] = resource_pool.browse(cr, uid, resource).calendar_id.id
+            result['calendar_id'] = resource_pool.browse(cr, uid, resource, context=context).calendar_id.id
             return {'value': result}
         return {'value': {'calendar_id': []}}
 
diff --git a/addons/sale/i18n/bs.po b/addons/sale/i18n/bs.po
index 23bca2d18a0..b32034c33de 100644
--- a/addons/sale/i18n/bs.po
+++ b/addons/sale/i18n/bs.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:45+0000\n"
+"PO-Revision-Date: 2010-12-15 20:56+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ca.po b/addons/sale/i18n/ca.po
index 46c74da85ee..c39853f3da7 100644
--- a/addons/sale/i18n/ca.po
+++ b/addons/sale/i18n/ca.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:37+0000\n"
+"PO-Revision-Date: 2010-12-15 20:48+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/el.po b/addons/sale/i18n/el.po
index 3c25a7f8761..bca484f6e12 100644
--- a/addons/sale/i18n/el.po
+++ b/addons/sale/i18n/el.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:22+0000\n"
-"Last-Translator: Christophe (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 19:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 3d1a6817915..bcfd6ce4bbd 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 21:19+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:20+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -424,7 +423,7 @@ msgstr "Contabilidad"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "(n/a)"
-msgstr ""
+msgstr "(n/a)"
 
 #. module: sale
 #: help:sale.advance.payment.inv,product_id:0
diff --git a/addons/sale/i18n/et.po b/addons/sale/i18n/et.po
index 6ea78ee0102..fd1fe87e564 100644
--- a/addons/sale/i18n/et.po
+++ b/addons/sale/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 21:01+0000\n"
+"PO-Revision-Date: 2010-12-15 21:31+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 7991b1fb283..0c081303b51 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 21:21+0000\n"
-"Last-Translator: Christophe (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 16:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/id.po b/addons/sale/i18n/id.po
index 6f252a0e226..b6cb7eb858c 100644
--- a/addons/sale/i18n/id.po
+++ b/addons/sale/i18n/id.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:36+0000\n"
+"PO-Revision-Date: 2010-12-15 20:48+0000\n"
 "Last-Translator: opix <inur.opix@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 3e8badd630f..194ace34bc7 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:21+0000\n"
-"Last-Translator: Christophe (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 18:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ko.po b/addons/sale/i18n/ko.po
index 64c78a05a03..c839463db78 100644
--- a/addons/sale/i18n/ko.po
+++ b/addons/sale/i18n/ko.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 21:05+0000\n"
+"PO-Revision-Date: 2010-12-15 21:56+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po
index d509b5fbe78..9f5a36d5781 100644
--- a/addons/sale/i18n/nl.po
+++ b/addons/sale/i18n/nl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:52+0000\n"
+"PO-Revision-Date: 2010-12-15 21:06+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/pl.po b/addons/sale/i18n/pl.po
index a1227209e50..bc26e0f9e01 100644
--- a/addons/sale/i18n/pl.po
+++ b/addons/sale/i18n/pl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:22+0000\n"
+"PO-Revision-Date: 2010-12-15 19:16+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/pt.po b/addons/sale/i18n/pt.po
index e450cbfc894..f3efc6a9c6e 100644
--- a/addons/sale/i18n/pt.po
+++ b/addons/sale/i18n/pt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-15 02:44+0000\n"
+"PO-Revision-Date: 2010-12-15 22:54+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 7c9b89dcc8d..0eb21bef1c0 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 21:02+0000\n"
+"PO-Revision-Date: 2010-12-15 15:51+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sale.pot b/addons/sale/i18n/sale.pot
index 3d77385be13..9c3e1758484 100644
--- a/addons/sale/i18n/sale.pot
+++ b/addons/sale/i18n/sale.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:16:23+0000\n"
-"PO-Revision-Date: 2010-12-10 17:16:23+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:19+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -37,6 +37,11 @@ msgstr ""
 msgid "Cancel Order"
 msgstr ""
 
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Configure Sales Order Logistics"
+msgstr ""
+
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
@@ -272,11 +277,6 @@ msgstr ""
 msgid "All Quotations"
 msgstr ""
 
-#. module: sale
-#: report:sale.order:0
-msgid "Our Salesman"
-msgstr ""
-
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
@@ -409,8 +409,8 @@ msgid "The quotation '%s' has been converted to a sale order."
 msgstr ""
 
 #. module: sale
-#: field:product.product,pricelist_purchase:0
-msgid "Purchase Pricelists"
+#: view:sale.installer:0
+msgid "Enhance your core Sales Application with additional functionalities."
 msgstr ""
 
 #. module: sale
@@ -510,6 +510,11 @@ msgstr ""
 msgid "# of Lines"
 msgstr ""
 
+#. module: sale
+#: view:sale.config.picking_policy:0
+msgid "Setup your sales workflow and default values."
+msgstr ""
+
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sale Make Invoice"
@@ -783,12 +788,9 @@ msgid "Sale Order Line"
 msgstr ""
 
 #. module: sale
-#: model:process.transition,name:sale.process_transition_invoice0
-#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
-#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
-#: view:sale.advance.payment.inv:0
-#: view:sale.order.line:0
-msgid "Create Invoice"
+#: report:sale.order:0
+#: field:sale.order.line,price_unit:0
+msgid "Unit Price"
 msgstr ""
 
 #. module: sale
@@ -841,6 +843,8 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_installer
+#: view:sale.config.picking_policy:0
+#: view:sale.installer:0
 msgid "Sales Application Configuration"
 msgstr ""
 
@@ -884,11 +888,6 @@ msgstr ""
 msgid "Sequence Number"
 msgstr ""
 
-#. module: sale
-#: field:product.product,pricelist_sale:0
-msgid "Sale Pricelists"
-msgstr ""
-
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
@@ -1232,9 +1231,12 @@ msgid "Sales"
 msgstr ""
 
 #. module: sale
-#: report:sale.order:0
-#: field:sale.order.line,price_unit:0
-msgid "Unit Price"
+#: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
+#: model:process.transition.action,name:sale.process_transition_action_createinvoice0
+#: view:sale.advance.payment.inv:0
+#: view:sale.order.line:0
+msgid "Create Invoice"
 msgstr ""
 
 #. module: sale
@@ -1608,6 +1610,11 @@ msgstr ""
 msgid "The Shipping Policy is used to configure per order if you want to deliver as soon as possible when one product is available or you wait that all products are available.."
 msgstr ""
 
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure"
+msgstr ""
+
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source document"
@@ -1653,6 +1660,7 @@ msgid "Uninvoiced"
 msgstr ""
 
 #. module: sale
+#: report:sale.order:0
 #: view:sale.order:0
 #: field:sale.order,user_id:0
 #: view:sale.order.line:0
@@ -1715,11 +1723,6 @@ msgstr ""
 msgid "Sales Orders"
 msgstr ""
 
-#. module: sale
-#: report:sale.order:0
-msgid "Payment Terms"
-msgstr ""
-
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:0
 #, python-format
@@ -1753,6 +1756,11 @@ msgstr ""
 msgid "January"
 msgstr ""
 
+#. module: sale
+#: view:sale.installer:0
+msgid "Configure Your Sales Management Application"
+msgstr ""
+
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
@@ -1883,6 +1891,7 @@ msgid "Search Sales Order"
 msgstr ""
 
 #. module: sale
+#: report:sale.order:0
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
 msgstr ""
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 234456fb780..fbc8e746815 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:53+0000\n"
+"PO-Revision-Date: 2010-12-15 21:07+0000\n"
 "Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index 40bc69833ca..79a4b1350e3 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-15 00:25+0000\n"
+"PO-Revision-Date: 2010-12-15 20:58+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index bce99319847..b9d02abbc80 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 20:39+0000\n"
+"PO-Revision-Date: 2010-12-15 20:52+0000\n"
 "Last-Translator: Jay (OpenERP) <jvo@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 432475cd881..20a6193fc41 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-15 01:30+0000\n"
+"PO-Revision-Date: 2010-12-15 21:27+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #, python-format
@@ -758,7 +758,7 @@ msgstr "Ngày tạo"
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Các công ty"
 
 #. module: sale
 #: selection:sale.report,month:0
@@ -1028,7 +1028,7 @@ msgstr "Lịch chờ"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Phương pháp mua hàng"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
@@ -1049,7 +1049,7 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Ngày đặt hàng"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1395,7 +1395,7 @@ msgstr "Sản phẩm"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "Hóa đơn"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
diff --git a/addons/sale/i18n/zh_CN.po b/addons/sale/i18n/zh_CN.po
index aca261d0174..f16da7b6f02 100644
--- a/addons/sale/i18n/zh_CN.po
+++ b/addons/sale/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 21:35+0000\n"
-"Last-Translator: Christophe (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 17:24+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 7eab5366a3f..f70c0e41a12 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -50,8 +50,6 @@ class sale_order(osv.osv):
     _description = "Sale Order"
 
     def copy(self, cr, uid, id, default=None, context=None):
-        if context is None:
-            context = {}
         if not default:
             default = {}
         default.update({
@@ -65,8 +63,6 @@ class sale_order(osv.osv):
         return super(sale_order, self).copy(cr, uid, id, default, context=context)
 
     def _amount_line_tax(self, cr, uid, line, context=None):
-        if context is None:
-            context = {}
         val = 0.0
         for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
             val += c.get('amount', 0.0)
@@ -74,8 +70,6 @@ class sale_order(osv.osv):
 
     def _amount_all(self, cr, uid, ids, field_name, arg, context=None):
         cur_obj = self.pool.get('res.currency')
-        if context is None:
-            context = {}
         res = {}
         for order in self.browse(cr, uid, ids, context=context):
             res[order.id] = {
@@ -95,8 +89,6 @@ class sale_order(osv.osv):
 
     # This is False
     def _picked_rate(self, cr, uid, ids, name, arg, context=None):
-        if context is None:
-            context = {}
         if not ids:
             return {}
         res = {}
@@ -131,8 +123,6 @@ class sale_order(osv.osv):
         return res
 
     def _invoiced_rate(self, cursor, user, ids, name, arg, context=None):
-        if context is None:
-            context = {}
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
             if sale.invoiced:
@@ -149,8 +139,6 @@ class sale_order(osv.osv):
         return res
 
     def _invoiced(self, cursor, user, ids, name, arg, context=None):
-        if context is None:
-            context = {}
         res = {}
         for sale in self.browse(cursor, user, ids, context=context):
             res[sale.id] = True
@@ -163,8 +151,6 @@ class sale_order(osv.osv):
         return res
 
     def _invoiced_search(self, cursor, user, obj, name, args, context=None):
-        if context is None:
-            context = {}
         if not len(args):
             return []
         clause = ''
@@ -195,8 +181,6 @@ class sale_order(osv.osv):
         return [('id', 'in', [x[0] for x in res])]
 
     def _get_order(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         result = {}
         for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
             result[line.order_id.id] = True
@@ -294,8 +278,6 @@ class sale_order(osv.osv):
 
     # Form filling
     def unlink(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         sale_orders = self.read(cr, uid, ids, ['state'], context=context)
         unlink_ids = []
         for s in sale_orders:
@@ -355,8 +337,6 @@ class sale_order(osv.osv):
         return {'value': val}
 
     def shipping_policy_change(self, cr, uid, ids, policy, context=None):
-        if context is None:
-            context = {}
         if not policy:
             return {}
         inv_qty = 'order'
@@ -367,8 +347,6 @@ class sale_order(osv.osv):
         return {'value': {'invoice_quantity': inv_qty}}
 
     def write(self, cr, uid, ids, vals, context=None):
-        if context is None:
-            context = {}
         if vals.get('order_policy', False):
             if vals['order_policy'] == 'prepaid':
                 vals.update({'invoice_quantity': 'order'})
@@ -377,8 +355,6 @@ class sale_order(osv.osv):
         return super(sale_order, self).write(cr, uid, ids, vals, context=context)
 
     def create(self, cr, uid, vals, context=None):
-        if context is None:
-            context = {}
         if vals.get('order_policy', False):
             if vals['order_policy'] == 'prepaid':
                 vals.update({'invoice_quantity': 'order'})
@@ -387,8 +363,6 @@ class sale_order(osv.osv):
         return super(sale_order, self).create(cr, uid, vals, context=context)
 
     def button_dummy(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         return True
 
     #FIXME: the method should return the list of invoices created (invoice_ids)
@@ -396,8 +370,6 @@ class sale_order(osv.osv):
     # cannot change it directly since the method is called by the sale order
     # workflow and I suppose it expects a single id...
     def _inv_get(self, cr, uid, order, context=None):
-        if context is None:
-            context = {}
         return {}
 
     def _make_invoice(self, cr, uid, order, lines, context=None):
@@ -495,7 +467,7 @@ class sale_order(osv.osv):
         # last day of the last month as invoice date
         if date_inv:
             context['date_inv'] = date_inv
-        for o in self.browse(cr, uid, ids):
+        for o in self.browse(cr, uid, ids, context=context):
             lines = []
             for line in o.order_line:
                 if line.invoiced:
@@ -506,7 +478,7 @@ class sale_order(osv.osv):
             if created_lines:
                 invoices.setdefault(o.partner_id.id, []).append((o, created_lines))
         if not invoices:
-            for o in self.browse(cr, uid, ids):
+            for o in self.browse(cr, uid, ids, context=context):
                 for i in o.invoice_ids:
                     if i.state == 'draft':
                         return i.id
@@ -534,7 +506,7 @@ class sale_order(osv.osv):
     def action_invoice_cancel(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        for sale in self.browse(cr, uid, ids):
+        for sale in self.browse(cr, uid, ids, context=context):
             for line in sale.order_line:
                 #
                 # Check if the line is invoiced (has asociated invoice
@@ -762,8 +734,6 @@ class sale_order(osv.osv):
         return True
 
     def action_ship_end(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for order in self.browse(cr, uid, ids, context=context):
             val = {'shipped': True}
             if order.state == 'shipping_except':
@@ -823,7 +793,8 @@ class sale_order_line(osv.osv):
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         res = {}
-        context = context or {}
+        if context is None:
+            context = {}
         for line in self.browse(cr, uid, ids, context=context):
             price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
             taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)
@@ -832,8 +803,6 @@ class sale_order_line(osv.osv):
         return res
 
     def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             try:
@@ -967,8 +936,6 @@ class sale_order_line(osv.osv):
         return create_ids
 
     def button_cancel(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for line in self.browse(cr, uid, ids, context=context):
             if line.invoiced:
                 raise osv.except_osv(_('Invalid action !'), _('You cannot cancel a sale order line that has already been invoiced !'))
@@ -980,13 +947,9 @@ class sale_order_line(osv.osv):
         return self.write(cr, uid, ids, {'state': 'cancel'})
 
     def button_confirm(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         return self.write(cr, uid, ids, {'state': 'confirmed'})
 
     def button_done(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         wf_service = netsvc.LocalService("workflow")
         res = self.write(cr, uid, ids, {'state': 'done'})
         for line in self.browse(cr, uid, ids, context=context):
@@ -1014,8 +977,6 @@ class sale_order_line(osv.osv):
         return {'value': value}
 
     def copy_data(self, cr, uid, id, default=None, context=None):
-        if context is None:
-            context = {}
         if not default:
             default = {}
         default.update({'state': 'draft', 'move_ids': [], 'invoiced': False, 'invoice_lines': []})
@@ -1171,8 +1132,6 @@ class sale_order_line(osv.osv):
         return res
 
     def unlink(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         """Allows to delete sale order lines in draft,cancel states"""
         for rec in self.browse(cr, uid, ids, context=context):
             if rec.state not in ['draft', 'cancel']:
@@ -1212,8 +1171,6 @@ class sale_config_picking_policy(osv.osv_memory):
     }
 
     def execute(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         for o in self.browse(cr, uid, ids, context=context):
             ir_values_obj = self.pool.get('ir.values')
             ir_values_obj.set(cr, uid, 'default', False, 'picking_policy', ['sale.order'], o.picking_policy)
diff --git a/addons/sale/stock.py b/addons/sale/stock.py
index 72e3f0a6c24..42208e1cfd9 100644
--- a/addons/sale/stock.py
+++ b/addons/sale/stock.py
@@ -117,8 +117,6 @@ class stock_picking(osv.osv):
         invoice_obj = self.pool.get('account.invoice')
         picking_obj = self.pool.get('stock.picking')
         invoice_line_obj = self.pool.get('account.invoice.line')
-        if context is None:
-            context = {}
 
         result = super(stock_picking, self).action_invoice_create(cursor, user,
                 ids, journal_id=journal_id, group=group, type=type,
@@ -190,7 +188,7 @@ class stock_picking(osv.osv):
 
     def action_cancel(self, cr, uid, ids, context=None):
         res = super(stock_picking, self).action_cancel(cr, uid, ids, context=context)
-        for pick in self.browse(cr, uid, ids, context):
+        for pick in self.browse(cr, uid, ids, context=context):
             call_ship_end = True
             if pick.sale_id:
                 for picks in pick.sale_id.picking_ids:
@@ -198,7 +196,7 @@ class stock_picking(osv.osv):
                         call_ship_end = False
                         break
                 if call_ship_end:
-                    self.pool.get('sale.order').action_ship_end(cr, uid, [pick.sale_id.id], context)
+                    self.pool.get('sale.order').action_ship_end(cr, uid, [pick.sale_id.id], context=context)
         return res
 
 stock_picking()
diff --git a/addons/sale/wizard/sale_line_invoice.py b/addons/sale/wizard/sale_line_invoice.py
index 0b6a5219b0c..b17b12c1e8f 100644
--- a/addons/sale/wizard/sale_line_invoice.py
+++ b/addons/sale/wizard/sale_line_invoice.py
@@ -26,7 +26,7 @@ import netsvc
 class sale_order_line_make_invoice(osv.osv_memory):
     _name = "sale.order.line.make.invoice"
     _description = "Sale OrderLine Make_invoice"
-    def make_invoices(self, cr, uid, ids, context):
+    def make_invoices(self, cr, uid, ids, context=None):
         """
              To make invoices.
 
@@ -80,7 +80,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
         sales_order_line_obj = self.pool.get('sale.order.line')
         sales_order_obj = self.pool.get('sale.order')
         wf_service = netsvc.LocalService('workflow')
-        for line in sales_order_line_obj.browse(cr, uid, context['active_ids']):
+        for line in sales_order_line_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if (not line.invoiced) and (line.state not in ('draft', 'cancel')):
                 if not line.order_id.id in invoices:
                     invoices[line.order_id.id] = []
@@ -98,7 +98,7 @@ class sale_order_line_make_invoice(osv.osv_memory):
                     (order_id,invoice_id) values (%s,%s)', (order.id, res))
 
             flag = True
-            data_sale = sales_order_obj.browse(cr, uid, line.order_id.id)
+            data_sale = sales_order_obj.browse(cr, uid, line.order_id.id, context=context)
             for line in data_sale.order_line:
                 if not line.invoiced:
                     flag = False
diff --git a/addons/sale/wizard/sale_make_invoice.py b/addons/sale/wizard/sale_make_invoice.py
index 7dd9ddac8d1..f414c2475d5 100644
--- a/addons/sale/wizard/sale_make_invoice.py
+++ b/addons/sale/wizard/sale_make_invoice.py
@@ -37,22 +37,24 @@ class sale_make_invoice(osv.osv_memory):
         if context is None:
             context = {}
         record_id = context and context.get('active_id', False)     
-        order = self.pool.get('sale.order').browse(cr, uid, record_id)
+        order = self.pool.get('sale.order').browse(cr, uid, record_id, context=context)
         if order.state == 'draft':
             raise osv.except_osv(_('Warning !'),'You can not create invoice when sale order is not confirmed.')
         return False
     
-    def make_invoices(self, cr, uid, ids, context={}):
+    def make_invoices(self, cr, uid, ids, context=None):
         order_obj = self.pool.get('sale.order')
         mod_obj = self.pool.get('ir.model.data')
         newinv = []
+        if context is None:
+            context = {}
         data = self.read(cr, uid, ids)[0]
         order_obj.action_invoice_create(cr, uid, context.get(('active_ids'), []), data['grouped'], date_inv = data['invoice_date'])
         wf_service = netsvc.LocalService("workflow")
         for id in context.get(('active_ids'), []):
             wf_service.trg_validate(uid, 'sale.order', id, 'manual_invoice', cr)
             
-        for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context):
+        for o in order_obj.browse(cr, uid, context.get(('active_ids'), []), context=context):
             for i in o.invoice_ids:
                 newinv.append(i.id)
         
diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py
index 8623ba0b879..29e87259903 100644
--- a/addons/sale/wizard/sale_make_invoice_advance.py
+++ b/addons/sale/wizard/sale_make_invoice_advance.py
@@ -34,7 +34,7 @@ class sale_advance_payment_inv(osv.osv_memory):
         'qtty': 1.0
     }
 
-    def create_invoices(self, cr, uid, ids, context={}):
+    def create_invoices(self, cr, uid, ids, context=None):
         """
              To create invoices.
 
@@ -51,9 +51,11 @@ class sale_advance_payment_inv(osv.osv_memory):
         obj_sale = self.pool.get('sale.order')
         obj_lines = self.pool.get('account.invoice.line')
         inv_obj = self.pool.get('account.invoice')
+        if context is None:
+            context = {}
 
-        for sale_adv_obj in self.browse(cr, uid, ids):
-            for sale in obj_sale.browse(cr, uid, context['active_ids']):
+        for sale_adv_obj in self.browse(cr, uid, ids, context=context):
+            for sale in obj_sale.browse(cr, uid, context.get('active_ids', []), context=context):
                 create_ids = []
                 ids_inv = []
                 if sale.order_policy == 'postpaid':
@@ -151,7 +153,7 @@ class sale_open_invoice(osv.osv_memory):
         if context is None:
             context = {}
         mod_obj = self.pool.get('ir.model.data')
-        for advance_pay in self.browse(cr, uid, ids):
+        for advance_pay in self.browse(cr, uid, ids, context=context):
             form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form')
             form_id = form_res and form_res[1] or False
             tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree')
diff --git a/addons/sale_analytic_plans/i18n/fr.po b/addons/sale_analytic_plans/i18n/fr.po
index 1eb960cab27..2d87678b6c0 100644
--- a/addons/sale_analytic_plans/i18n/fr.po
+++ b/addons/sale_analytic_plans/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2009-11-09 19:55+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-12-15 21:00+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:11+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
@@ -29,7 +30,7 @@ msgstr "Gestion de la Distribution Analytique des Ventes"
 #. module: sale_analytic_plans
 #: model:ir.model,name:sale_analytic_plans.model_sale_order_line
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Ligne de commande de vente"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
index 8268fca731d..355a849a351 100644
--- a/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
+++ b/addons/sale_analytic_plans/i18n/sale_analytic_plans.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:30+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:19+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:19+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_analytic_plans/sale_analytic_plans.py b/addons/sale_analytic_plans/sale_analytic_plans.py
index cc006f3afc0..b8ccc44079d 100644
--- a/addons/sale_analytic_plans/sale_analytic_plans.py
+++ b/addons/sale_analytic_plans/sale_analytic_plans.py
@@ -32,7 +32,7 @@ class sale_order_line(osv.osv):
         line_obj = self.pool.get('account.invoice.line')
         create_ids = super(sale_order_line, self).invoice_line_create(cr, uid, ids, context=context)
         i = 0
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             line_obj.write(cr, uid, [create_ids[i]], {'analytics_id': line.analytics_id.id})
             i = i + 1
         return create_ids
diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot
index 9b979b952dc..84bac8e3530 100644
--- a/addons/sale_crm/i18n/sale_crm.pot
+++ b/addons/sale_crm/i18n/sale_crm.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:30+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:20+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -107,6 +107,11 @@ msgstr ""
 msgid "Shop"
 msgstr ""
 
+#. module: sale_crm
+#: view:board.board:0
+msgid "Opportunities by Stage"
+msgstr ""
+
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py
index 0c72c3205cd..506177d08f4 100644
--- a/addons/sale_crm/wizard/crm_make_sale.py
+++ b/addons/sale_crm/wizard/crm_make_sale.py
@@ -39,7 +39,7 @@ class crm_make_sale(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return: default value of partner_id field.
         """
-        if not context:
+        if context is None:
             context = {}
 
         lead_obj = self.pool.get('crm.lead')
@@ -51,8 +51,6 @@ class crm_make_sale(osv.osv_memory):
         return lead['partner_id']
 
     def view_init(self, cr, uid, fields_list, context=None):
-        if context is None:
-            context = {}
         return super(crm_make_sale, self).view_init(cr, uid, fields_list, context=context)
 
     def makeOrder(self, cr, uid, ids, context=None):
@@ -65,7 +63,7 @@ class crm_make_sale(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return: Dictionary value of created sale order.
         """
-        if not context:
+        if context is None:
             context = {}
 
         case_obj = self.pool.get('crm.lead')
@@ -138,8 +136,6 @@ class crm_make_sale(osv.osv_memory):
             return value
 
     def _get_shop_id(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
         cmpny_id = self.pool.get('res.users')._get_company(cr, uid, context=context)
         shop = self.pool.get('sale.shop').search(cr, uid, [('company_id', '=', cmpny_id)])
         return shop and shop[0] or False
diff --git a/addons/sale_journal/i18n/fr.po b/addons/sale_journal/i18n/fr.po
index 88f60f84333..2e36b0ca828 100644
--- a/addons/sale_journal/i18n/fr.po
+++ b/addons/sale_journal/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 21:43+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-15 21:03+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
@@ -25,6 +26,7 @@ msgstr "Note"
 #: help:res.partner,property_invoice_type:0
 msgid "The type of journal used for sales and picking."
 msgstr ""
+"Le type de journaux utilisé pour les ventes et les opérations de manutention."
 
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_sale_order
@@ -43,6 +45,10 @@ msgid ""
 "create journal to group your invoicing according to customer's needs: daily, "
 "each wednesday, monthly, etc."
 msgstr ""
+"Les types de factures sont utilisés sur les partenaires, les commandes de "
+"vente et les ordres de livraison. Vous pouvez créer un journal pour grouper "
+"vos facturations en fonction des besoins des clients: journalier, chaque "
+"mercredi, mensuel, etc."
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -55,6 +61,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the invoice "
 "type without removing it."
 msgstr ""
+"Si le champ actif n'est pas coché, vous pourrez cacher un type de facture "
+"sans le supprimer."
 
 #. module: sale_journal
 #: view:sale_journal.invoice.type:0
@@ -86,7 +94,7 @@ msgstr "Groupé"
 #. module: sale_journal
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de membres associés récursifs."
 
 #. module: sale_journal
 #: field:sale_journal.invoice.type,invoicing_method:0
@@ -114,7 +122,7 @@ msgstr "Partenaire"
 #. module: sale_journal
 #: model:ir.model,name:sale_journal.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Liste de préparation"
 
 #. module: sale_journal
 #: model:ir.module.module,shortdesc:sale_journal.module_meta_information
diff --git a/addons/sale_journal/i18n/sale_journal.pot b/addons/sale_journal/i18n/sale_journal.pot
index c68fda37d01..e3525f63047 100644
--- a/addons/sale_journal/i18n/sale_journal.pot
+++ b/addons/sale_journal/i18n/sale_journal.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:30+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:30+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:20+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:20+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_layout/i18n/es.po b/addons/sale_layout/i18n/es.po
index b257fed81bc..c41a6c1d5c9 100644
--- a/addons/sale_layout/i18n/es.po
+++ b/addons/sale_layout/i18n/es.po
@@ -8,14 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-05 07:43+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:25+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
@@ -36,7 +35,7 @@ msgstr "Desc. (%)"
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
@@ -46,12 +45,12 @@ msgstr "Precio unidad"
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Order N°"
-msgstr ""
+msgstr "Pedido Nº"
 
 #. module: sale_layout
 #: field:sale.order,abstract_line_ids:0
 msgid "Order Lines"
-msgstr ""
+msgstr "Líneas de pedido"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
@@ -141,52 +140,52 @@ msgstr "Plantilla de pedido de venta"
 #. module: sale_layout
 #: model:ir.model,name:sale_layout.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax:"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Date Ordered"
-msgstr ""
+msgstr "Fecha Pedido"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Shipping address :"
-msgstr ""
+msgstr "Dirección de envío :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Taxes"
-msgstr ""
+msgstr "Impuestos"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Net Total :"
-msgstr ""
+msgstr "Total neto :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Tel. :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Total :"
-msgstr ""
+msgstr "Total :"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Payment Terms"
-msgstr ""
+msgstr "Plazos de pago"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -196,42 +195,42 @@ msgstr ""
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Sale Order Lines"
-msgstr ""
+msgstr "Líneas del pedido de venta"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Separator Line"
-msgstr ""
+msgstr "Línea de separación"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Your Reference"
-msgstr ""
+msgstr "Su referencia"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Fecha presupuesto"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "TVA :"
-msgstr ""
+msgstr "IVA :"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Qty"
-msgstr ""
+msgstr "Ctd."
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "States"
-msgstr ""
+msgstr "Estados"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Sales order lines"
-msgstr ""
+msgstr "Líneas del pedido de ventas"
 
 #. module: sale_layout
 #: model:ir.actions.report.xml,name:sale_layout.sale_order_1
@@ -241,7 +240,7 @@ msgstr ""
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Información extra"
 
 #. module: sale_layout
 #: view:sale.order:0
@@ -251,27 +250,27 @@ msgstr "UdM"
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Page Break"
-msgstr ""
+msgstr "Salto de página"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Order Line"
-msgstr ""
+msgstr "Línea de pedido"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Price"
-msgstr ""
+msgstr "Precio"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
 msgid "Taxes :"
-msgstr ""
+msgstr "Impuestos :"
 
 #. module: sale_layout
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr ""
+msgstr "Movimientos de stock"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/sale_layout/i18n/fr.po b/addons/sale_layout/i18n/fr.po
index e732a0c275c..996a95d7ced 100755
--- a/addons/sale_layout/i18n/fr.po
+++ b/addons/sale_layout/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 21:44+0000\n"
+"PO-Revision-Date: 2010-12-15 09:50+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
diff --git a/addons/sale_layout/i18n/sale_layout.pot b/addons/sale_layout/i18n/sale_layout.pot
index a36a882aa35..040aeb9780b 100644
--- a/addons/sale_layout/i18n/sale_layout.pot
+++ b/addons/sale_layout/i18n/sale_layout.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:31+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:21+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py
index 90192615f1a..f5b036d143f 100755
--- a/addons/sale_layout/sale_layout.py
+++ b/addons/sale_layout/sale_layout.py
@@ -27,16 +27,15 @@ class sale_order_line(osv.osv):
 
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-        context = context or {}
         for line in self.browse(cr, uid, ids, context=context):
             if line.layout_type == 'article':
                 return super(sale_order_line, self)._amount_line(cr, uid, ids, field_name, arg, context)
         return res
     
-    def invoice_line_create(self, cr, uid, ids, context={}):
+    def invoice_line_create(self, cr, uid, ids, context=None):
         new_ids = []
         list_seq = []
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             if line.layout_type == 'article':
                 new_ids.append(line.id)
                 list_seq.append(line.sequence)
@@ -98,7 +97,7 @@ class sale_order_line(osv.osv):
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
-        default['layout_type'] = self.browse(cr, uid, id).layout_type
+        default['layout_type'] = self.browse(cr, uid, id, context=context).layout_type
         return super(sale_order_line, self).copy(cr, uid, id, default, context)
 
     _order = "order_id, sequence asc"
@@ -127,8 +126,6 @@ sale_order_line()
 
 class one2many_mod2(fields.one2many):
     def get(self, cr, obj, ids, name, user=None, offset=0, context=None, values=None):
-        if not context:
-            context = {}
         if not values:
             values = {}
         res = {}
diff --git a/addons/sale_margin/i18n/sale_margin.pot b/addons/sale_margin/i18n/sale_margin.pot
index d3b57f3c22e..bb95ecac38a 100644
--- a/addons/sale_margin/i18n/sale_margin.pot
+++ b/addons/sale_margin/i18n/sale_margin.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:31+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:21+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 3a0e09a0309..fdf7eaf69e4 100644
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -36,7 +36,7 @@ class sale_order_line(osv.osv):
 
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = 0
             if line.product_id:
                 if line.purchase_price:
diff --git a/addons/sale_mrp/i18n/sale_mrp.pot b/addons/sale_mrp/i18n/sale_mrp.pot
index e2cfc8e2474..68a1361c0e3 100644
--- a/addons/sale_mrp/i18n/sale_mrp.pot
+++ b/addons/sale_mrp/i18n/sale_mrp.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:31+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:31+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:21+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:21+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_mrp/sale_mrp.py b/addons/sale_mrp/sale_mrp.py
index 2ae230ae4a8..cea62f19fa0 100644
--- a/addons/sale_mrp/sale_mrp.py
+++ b/addons/sale_mrp/sale_mrp.py
@@ -32,8 +32,6 @@ class mrp_production(osv.osv):
         @return: Dictionary of values.
         """
         res = {}
-        if context is None:
-            context = {}
         if not field_names:
             field_names = []
         for id in ids:
diff --git a/addons/sale_order_dates/i18n/fr.po b/addons/sale_order_dates/i18n/fr.po
index 28965184bb3..be0f3cb16b1 100644
--- a/addons/sale_order_dates/i18n/fr.po
+++ b/addons/sale_order_dates/i18n/fr.po
@@ -7,51 +7,52 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-08-30 11:49+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-12-15 21:06+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_order_dates
 #: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
 msgid "Sale Order Dates"
-msgstr ""
+msgstr "Dates de commande de vente"
 
 #. module: sale_order_dates
 #: field:sale.order,commitment_date:0
 msgid "Commitment Date"
-msgstr ""
+msgstr "Date d'engagement"
 
 #. module: sale_order_dates
 #: model:ir.model,name:sale_order_dates.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Commande de vente"
 
 #. module: sale_order_dates
 #: help:sale.order,effective_date:0
 msgid "Date on which picking is created"
-msgstr ""
+msgstr "Date de préparation"
 
 #. module: sale_order_dates
 #: field:sale.order,effective_date:0
 msgid "Effective Date"
-msgstr ""
+msgstr "Date effective"
 
 #. module: sale_order_dates
 #: help:sale.order,commitment_date:0
 msgid "Date on which delivery of products is to be made"
-msgstr ""
+msgstr "Date à laquelle les produits doivent être livrés."
 
 #. module: sale_order_dates
 #: help:sale.order,requested_date:0
 msgid "Date on which customer has requested for sales"
-msgstr ""
+msgstr "Date demandée par le client"
 
 #. module: sale_order_dates
 #: field:sale.order,requested_date:0
 msgid "Requested Date"
-msgstr ""
+msgstr "Date demandée"
diff --git a/addons/sale_order_dates/i18n/sale_order_dates.pot b/addons/sale_order_dates/i18n/sale_order_dates.pot
index ccc44bb9013..009848a674f 100644
--- a/addons/sale_order_dates/i18n/sale_order_dates.pot
+++ b/addons/sale_order_dates/i18n/sale_order_dates.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:32+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:32+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:22+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/sale_order_dates/sale_order_dates.py b/addons/sale_order_dates/sale_order_dates.py
index 2877ba0967d..d5d3eeca405 100644
--- a/addons/sale_order_dates/sale_order_dates.py
+++ b/addons/sale_order_dates/sale_order_dates.py
@@ -30,7 +30,7 @@ class sale_order_dates(osv.osv):
     def _get_effective_date(self, cr, uid, ids, name, arg, context=None):
         res = {}
         dates_list = []
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             dates_list = []
             for pick in order.picking_ids:
                 dates_list.append(pick.date)
@@ -43,7 +43,7 @@ class sale_order_dates(osv.osv):
     def _get_commitment_date(self, cr, uid, ids, name, arg, context=None):
         res = {}
         dates_list = []
-        for order in self.browse(cr, uid, ids):
+        for order in self.browse(cr, uid, ids, context=context):
             dates_list = []
             for line in order.order_line:
                 dt = datetime.strptime(order.date_order, '%Y-%m-%d') + relativedelta(days=line.delay or 0.0)
diff --git a/addons/share/i18n/de.po b/addons/share/i18n/de.po
index a52bbc6dca8..3fa84cf2798 100644
--- a/addons/share/i18n/de.po
+++ b/addons/share/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-01 07:26+0000\n"
+"PO-Revision-Date: 2010-12-15 13:02+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: share
diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot
index dd4dc8db871..d437031ab1d 100644
--- a/addons/share/i18n/share.pot
+++ b/addons/share/i18n/share.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:32+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:32+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:22+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:22+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index a7789e52431..2ad2784b323 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -92,7 +92,7 @@ class share_create(osv.osv_memory):
 
     def _create_new_share_users(self, cr, uid, wizard_data, group_id, context=None):
         user_obj = self.pool.get('res.users')
-        current_user = user_obj.browse(cr, uid, uid)
+        current_user = user_obj.browse(cr, uid, uid, context=context)
         user_ids = []
         if wizard_data.user_type == 'new':
             for new_user in wizard_data.new_users.split('\n'):
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index d5e4477dd08..cb8e28f3f2e 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-07-20 22:20+0000\n"
+"PO-Revision-Date: 2010-12-15 09:51+0000\n"
 "Last-Translator: Giedrius Slavinskas <giedrius.slavinskas@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: lt\n"
 
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index 4fef984f7cc..ab84fde95bb 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:41+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 5d104a53ab3..f6007531904 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:35+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:35+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:25+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1787,6 +1787,11 @@ msgstr ""
 msgid "Warehouse Management"
 msgstr ""
 
+#. module: stock
+#: selection:stock.picking,move_type:0
+msgid "Partial Delivery"
+msgstr ""
+
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
@@ -3238,11 +3243,6 @@ msgstr ""
 msgid "Set to zero"
 msgstr ""
 
-#. module: stock
-#: selection:stock.picking,move_type:0
-msgid "Direct Delivery"
-msgstr ""
-
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index da418f4013b..0ca92cab6e6 100644
--- a/addons/stock/i18n/vi.po
+++ b/addons/stock/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-12 13:52+0000\n"
+"PO-Revision-Date: 2010-12-15 15:20+0000\n"
 "Last-Translator: Phong Nguyen <Unknown>\n"
 "Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -125,7 +125,7 @@ msgstr ""
 #: field:stock.split.into,quantity:0
 #, python-format
 msgid "Quantity"
-msgstr "Quantity"
+msgstr "Số lượng"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -141,7 +141,7 @@ msgstr "Ngày"
 #: view:stock.picking:0
 #: view:stock.production.lot:0
 msgid "UoM"
-msgstr "UoM"
+msgstr "Đơn vị đo"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form
@@ -920,7 +920,7 @@ msgstr ""
 #. module: stock
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Lỗi: mã EAN không hợp lệ"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -1406,7 +1406,7 @@ msgstr ""
 #: field:res.partner,property_stock_supplier:0
 #: selection:stock.location,usage:0
 msgid "Supplier Location"
-msgstr "Supplier Location"
+msgstr "Vị trí nhà cung cấp"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1435,7 +1435,7 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_inventory
 msgid "Stock Statistics"
-msgstr ""
+msgstr "Thống kê hàng hóa"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
@@ -1473,7 +1473,7 @@ msgstr "Stock Moves"
 #: selection:stock.location,chained_picking_type:0
 #: selection:stock.picking,type:0
 msgid "Sending Goods"
-msgstr "Sending Goods"
+msgstr "Gửi hàng hóa"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1516,7 +1516,7 @@ msgstr "Counter-Part Locations Properties"
 #. module: stock
 #: view:stock.location:0
 msgid "Localization"
-msgstr ""
+msgstr "Bản địa hóa"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_report_tracklots
@@ -1527,7 +1527,7 @@ msgstr ""
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Delivered Qty"
-msgstr "Delivered Qty"
+msgstr "Số lượng đã giao"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.track_line
@@ -1553,7 +1553,7 @@ msgstr ""
 #: field:stock.partial.picking,date:0
 #: view:stock.picking:0
 msgid "Date"
-msgstr "Date"
+msgstr "Ngày"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -1566,7 +1566,7 @@ msgstr "Bộ lọc mở rộng..."
 #. module: stock
 #: field:stock.warehouse,lot_stock_id:0
 msgid "Location Stock"
-msgstr "Location Stock"
+msgstr "Vị trí hàng hóa"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
@@ -1627,7 +1627,7 @@ msgstr "You cannot remove the picking which is in %s state !"
 #: view:stock.move.split:0
 #: view:stock.picking:0
 msgid "Cancel"
-msgstr "Cancel"
+msgstr "Hủy bỏ"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking
@@ -1650,7 +1650,7 @@ msgstr ""
 #. module: stock
 #: view:product.template:0
 msgid "Information"
-msgstr "Information"
+msgstr "Thông tin"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1666,7 +1666,7 @@ msgstr "Provide the quantities of the returned products."
 #. module: stock
 #: view:stock.change.standard.price:0
 msgid "Cost Price"
-msgstr ""
+msgstr "Giá vốn"
 
 #. module: stock
 #: view:product.product:0
@@ -1677,13 +1677,13 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Tạo hóa đơn"
 
 #. module: stock
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Process Later"
-msgstr "Process Later"
+msgstr "Xử lý sau"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
@@ -1697,7 +1697,7 @@ msgstr ""
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
 msgid "Owner Address"
-msgstr "Owner Address"
+msgstr "Địa chỉ người sở hữu"
 
 #. module: stock
 #: model:ir.actions.act_window,help:stock.action_stock_move_report
@@ -1715,7 +1715,7 @@ msgstr ""
 #. module: stock
 #: field:stock.change.standard.price,new_price:0
 msgid "Price"
-msgstr ""
+msgstr "Giá"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -1739,12 +1739,12 @@ msgstr ""
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Received Qty"
-msgstr "Received Qty"
+msgstr "Số lượng nhận vào"
 
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Reference"
-msgstr ""
+msgstr "Tham chiếu nội bộ"
 
 #. module: stock
 #: help:stock.production.lot,prefix:0
@@ -1765,7 +1765,7 @@ msgstr ""
 #: field:stock.move,name:0
 #: field:stock.warehouse,name:0
 msgid "Name"
-msgstr "Name"
+msgstr "Tên"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -1905,7 +1905,7 @@ msgstr "Automatic No Step Added"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Product "
-msgstr ""
+msgstr "Sản phẩm "
 
 #. module: stock
 #: view:stock.location.product:0
@@ -1948,7 +1948,7 @@ msgstr "Inventory loss"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Document"
-msgstr ""
+msgstr "Tài liệu"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1959,13 +1959,13 @@ msgstr ""
 #: field:stock.move,product_uom:0
 #: field:stock.move.memory,product_uom:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Đơn vị đo lường"
 
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Products: "
-msgstr "Products: "
+msgstr "Các sản phẩm: "
 
 #. module: stock
 #: help:product.product,track_production:0
@@ -1994,7 +1994,7 @@ msgstr ""
 #. module: stock
 #: view:product.product:0
 msgid "Update"
-msgstr ""
+msgstr "Cập nhật"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2010,7 +2010,7 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.move,type:0
 msgid "Others"
-msgstr ""
+msgstr "Khác"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -2032,7 +2032,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Products "
-msgstr ""
+msgstr "Các sản phẩm "
 
 #. module: stock
 #: field:product.product,track_incoming:0
@@ -2657,7 +2657,7 @@ msgstr "Không gấp"
 #. module: stock
 #: view:stock.move:0
 msgid "To Do"
-msgstr ""
+msgstr "Cần thực hiện"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_warehouse_form
@@ -3010,7 +3010,7 @@ msgstr "Do you want to merge theses inventories ?"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr "Cancelled"
+msgstr "Đã hủy"
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
@@ -3081,12 +3081,12 @@ msgstr ""
 #: view:stock.picking:0
 #: selection:stock.picking,state:0
 msgid "Confirmed"
-msgstr "Confirmed"
+msgstr "Đã xác nhận"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm"
-msgstr "Confirm"
+msgstr "Xác nhận"
 
 #. module: stock
 #: help:stock.location,icon:0
@@ -3698,7 +3698,7 @@ msgstr "Số lượng sản xuất"
 #: field:product.template,property_stock_account_output:0
 #: field:stock.change.standard.price,stock_account_output:0
 msgid "Stock Output Account"
-msgstr "Stock Output Account"
+msgstr "Tài khoản hàng xuất ra"
 
 #. module: stock
 #: view:stock.move:0
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index b64aaf6c0d9..9622c9b6f43 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-15 02:45+0000\n"
-"Last-Translator: Joshua Jan <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 15:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/product.py b/addons/stock/product.py
index b412d8f9782..27b7590cf5d 100644
--- a/addons/stock/product.py
+++ b/addons/stock/product.py
@@ -53,7 +53,7 @@ class product_product(osv.osv):
             'property_stock_variation': account_variation
         }
 
-    def do_change_standard_price(self, cr, uid, ids, datas, context={}):
+    def do_change_standard_price(self, cr, uid, ids, datas, context=None):
         """ Changes the Standard Price of Product and creates an account move accordingly.
         @param datas : dict. contain default datas like new_price, stock_output_account, stock_input_account, stock_journal
         @param context: A standard dictionary
@@ -63,19 +63,21 @@ class product_product(osv.osv):
         location_obj = self.pool.get('stock.location')
         move_obj = self.pool.get('account.move')
         move_line_obj = self.pool.get('account.move.line')
+        if context is None:
+            context = {}
 
         new_price = datas.get('new_price', 0.0)
         stock_output_acc = datas.get('stock_output_account', False)
         stock_input_acc = datas.get('stock_input_account', False)
         journal_id = datas.get('stock_journal', False)
-        product_obj=self.browse(cr,uid,ids)[0]
+        product_obj=self.browse(cr, uid, ids, context=context)[0]
         account_variation = product_obj.categ_id.property_stock_variation
         account_variation_id = account_variation and account_variation.id or False
         if not account_variation_id: raise osv.except_osv(_('Error!'), _('Variation Account is not specified for Product Category: %s') % (product_obj.categ_id.name))
         move_ids = []
         loc_ids = location_obj.search(cr, uid,[('usage','=','internal')])
         for rec_id in ids:
-            for location in location_obj.browse(cr, uid, loc_ids):
+            for location in location_obj.browse(cr, uid, loc_ids, context=context):
                 c = context.copy()
                 c.update({
                     'location': location.id,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 3a441f32ee4..0d8b1933f20 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -260,7 +260,7 @@ class stock_location(osv.osv):
             context = {}
         product_obj = self.pool.get('product.product')
         # Take the user company and pricetype
-        context['currency_id'] = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id
+        context['currency_id'] = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
 
         # To be able to offer recursive or non-recursive reports we need to prevent recursive quantities by default
         context['compute_child'] = False
@@ -487,8 +487,6 @@ class stock_tracking(osv.osv):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []
-        if not context:
-            context = {}
         ids = self.search(cr, user, [('serial', '=', name)]+ args, limit=limit, context=context)
         ids += self.search(cr, user, [('name', operator, name)]+ args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context)
@@ -534,7 +532,7 @@ class stock_picking(osv.osv):
             return False
         if isinstance(ids, (int, long)):
             ids = [ids]
-        for pick in self.browse(cr, uid, ids, context):
+        for pick in self.browse(cr, uid, ids, context=context):
             sql_str = """update stock_move set
                     date='%s'
                 where
@@ -649,7 +647,7 @@ class stock_picking(osv.osv):
         'date': time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.picking', context=c)
     }
-    def action_process(self, cr, uid, ids, context={}):
+    def action_process(self, cr, uid, ids, context=None):
         return {
             'name':_("Products to Process"),
             'view_mode': 'form',
@@ -670,7 +668,7 @@ class stock_picking(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        picking_obj = self.browse(cr, uid, [id], context)[0]
+        picking_obj = self.browse(cr, uid, id, context=context)
         move_obj=self.pool.get('stock.move')
         if ('name' not in default) or (picking_obj.name=='/'):
             seq_obj_name =  'stock.picking.' + picking_obj.type
@@ -679,7 +677,7 @@ class stock_picking(osv.osv):
             default['backorder_id'] = False
         res=super(stock_picking, self).copy(cr, uid, id, default, context)
         if res:
-            picking_obj = self.browse(cr, uid, [res], context)[0]
+            picking_obj = self.browse(cr, uid, res, context=context)
             for move in picking_obj.move_lines:
                 move_obj.write(cr, uid, [move.id], {'tracking_id': False,'prodlot_id':False})
         return res
@@ -754,7 +752,7 @@ class stock_picking(osv.osv):
             context = {}
         wf_service = netsvc.LocalService("workflow")
         self.draft_force_assign(cr, uid, ids)
-        for pick in self.browse(cr, uid, ids):
+        for pick in self.browse(cr, uid, ids, context=context):
             move_ids = [x.id for x in pick.move_lines]
             self.pool.get('stock.move').force_assign(cr, uid, move_ids)
             wf_service.trg_write(uid, 'stock.picking', pick.id, cr)
@@ -820,7 +818,7 @@ class stock_picking(osv.osv):
         """ Changes picking state to cancel.
         @return: True
         """
-        for pick in self.browse(cr, uid, ids):
+        for pick in self.browse(cr, uid, ids, context=context):
             ids2 = [move.id for move in pick.move_lines]
             self.pool.get('stock.move').action_cancel(cr, uid, ids2, context)
         self.write(cr, uid, ids, {'state': 'cancel', 'invoice_state': 'none'})
@@ -841,7 +839,7 @@ class stock_picking(osv.osv):
         """ Changes move state to assigned.
         @return: True
         """
-        for pick in self.browse(cr, uid, ids):
+        for pick in self.browse(cr, uid, ids, context=context):
             todo = []
             for move in pick.move_lines:
                 if move.state == 'assigned':
@@ -1110,7 +1108,7 @@ class stock_picking(osv.osv):
                     return False
         return True
 
-    def allow_cancel(self, cr, uid, ids, context={}):
+    def allow_cancel(self, cr, uid, ids, context=None):
         for pick in self.browse(cr, uid, ids, context=context):
             if not pick.move_lines:
                 return True
@@ -1333,6 +1331,8 @@ class stock_production_lot(osv.osv):
         """ Gets stock of products for locations
         @return: Dictionary of values
         """
+        if context is None:
+            context = {}
         if 'location_id' not in context:
             locations = self.pool.get('stock.location').search(cr, uid, [('usage', '=', 'internal')], context=context)
         else:
@@ -1392,7 +1392,7 @@ class stock_production_lot(osv.osv):
     _sql_constraints = [
         ('name_ref_uniq', 'unique (name, ref)', 'The combination of serial number and internal reference must be unique !'),
     ]
-    def action_traceability(self, cr, uid, ids, context={}):
+    def action_traceability(self, cr, uid, ids, context=None):
         """ It traces the information of a product
         @param self: The object pointer.
         @param cr: A database cursor
@@ -1447,15 +1447,15 @@ class stock_move(osv.osv):
 
     def name_get(self, cr, uid, ids, context=None):
         res = []
-        for line in self.browse(cr, uid, ids, context):
+        for line in self.browse(cr, uid, ids, context=context):
             res.append((line.id, (line.product_id.code or '/')+': '+line.location_id.name+' > '+line.location_dest_id.name))
         return res
 
-    def _check_tracking(self, cr, uid, ids):
+    def _check_tracking(self, cr, uid, ids, context=None):
         """ Checks if production lot is assigned to stock move or not.
         @return: True or False
         """
-        for move in self.browse(cr, uid, ids):
+        for move in self.browse(cr, uid, ids, context=context):
             if not move.prodlot_id and \
                (move.state == 'done' and \
                ( \
@@ -1467,11 +1467,11 @@ class stock_move(osv.osv):
                 return False
         return True
 
-    def _check_product_lot(self, cr, uid, ids):
+    def _check_product_lot(self, cr, uid, ids, context=None):
         """ Checks whether move is done or not and production lot is assigned to that move.
         @return: True or False
         """
-        for move in self.browse(cr, uid, ids):
+        for move in self.browse(cr, uid, ids, context=context):
             if move.prodlot_id and move.state == 'done' and (move.prodlot_id.product_id.id != move.product_id.id):
                 return False
         return True
@@ -1529,6 +1529,8 @@ class stock_move(osv.osv):
         """ Gets default address of partner for destination location
         @return: Address id or False
         """
+        if context is None:
+            context = {}
         if context.get('move_line', []):
             if context['move_line'][0]:
                 if isinstance(context['move_line'][0], (tuple, list)):
@@ -1545,6 +1547,8 @@ class stock_move(osv.osv):
         """ Gets default address of partner for source location
         @return: Address id or False
         """
+        if context is None:
+            context = {}
         if context.get('move_line', []):
             try:
                 return context['move_line'][0][2]['location_id']
@@ -1569,7 +1573,7 @@ class stock_move(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if uid != 1:
             frozen_fields = set(['product_qty', 'product_uom', 'product_uos_qty', 'product_uos', 'location_id', 'location_dest_id', 'product_id'])
-            for move in self.browse(cr, uid, ids):
+            for move in self.browse(cr, uid, ids, context=context):
                 if move.state == 'done':
                     if frozen_fields.intersection(vals):
                         raise osv.except_osv(_('Operation forbidden'),
@@ -1757,7 +1761,7 @@ class stock_move(osv.osv):
         """ Confirms stock move.
         @return: List of ids.
         """
-        moves = self.browse(cr, uid, ids)
+        moves = self.browse(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'confirmed'})
         res_obj = self.pool.get('res.company')
         location_obj = self.pool.get('stock.location')
@@ -1810,14 +1814,14 @@ class stock_move(osv.osv):
         res = self.check_assign(cr, uid, todo)
         return res
 
-    def force_assign(self, cr, uid, ids, context={}):
+    def force_assign(self, cr, uid, ids, context=None):
         """ Changes the state to assigned.
         @return: True
         """
         self.write(cr, uid, ids, {'state': 'assigned'})
         return True
 
-    def cancel_assign(self, cr, uid, ids, context={}):
+    def cancel_assign(self, cr, uid, ids, context=None):
         """ Changes the state to confirmed.
         @return: True
         """
@@ -1872,7 +1876,7 @@ class stock_move(osv.osv):
 
     def setlast_tracking(self, cr, uid, ids, context=None):
         tracking_obj = self.pool.get('stock.tracking')
-        picking = self.browse(cr, uid, ids)[0].picking_id
+        picking = self.browse(cr, uid, ids, context=context)[0].picking_id
         if picking:
             last_track = [line.tracking_id.id for line in picking.move_lines if line.tracking_id]
             if not last_track:
@@ -1895,7 +1899,7 @@ class stock_move(osv.osv):
         if context is None:
             context = {}
         pickings = {}
-        for move in self.browse(cr, uid, ids):
+        for move in self.browse(cr, uid, ids, context=context):
             if move.state in ('confirmed', 'waiting', 'assigned', 'draft'):
                 if move.picking_id:
                     pickings[move.picking_id.id] = True
@@ -2023,22 +2027,23 @@ class stock_move(osv.osv):
         partial_obj=self.pool.get('stock.partial.picking')
         partial_id=partial_obj.search(cr,uid,[])
         if partial_id:
-            partial_datas=partial_obj.read(cr,uid,partial_id)[0]
+            partial_datas = partial_obj.read(cr, uid, partial_id, context=context)[0]
         if context is None:
             context = {}
 
         todo = []
-        for move in self.browse(cr, uid, ids):
+        for move in self.browse(cr, uid, ids, context=context):
             if move.state=="draft":
                 todo.append(move.id)
         if todo:
             self.action_confirm(cr, uid, todo, context=context)
 
-        for move in self.browse(cr, uid, ids):
+        for move in self.browse(cr, uid, ids, context=context):
             if move.picking_id:
                 picking_ids.append(move.picking_id.id)
             if move.move_dest_id.id and (move.state != 'done'):
-                cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
+                self.write(cr, uid, [move.id], {'move_history_ids': [(4, move.move_dest_id.id)]})
+                #cr.execute('insert into stock_move_history_ids (parent_id,child_id) values (%s,%s)', (move.id, move.move_dest_id.id))
                 if move.move_dest_id.state in ('waiting', 'confirmed'):
                     self.write(cr, uid, [move.move_dest_id.id], {'state': 'assigned'})
                     if move.move_dest_id.picking_id:
@@ -2185,7 +2190,7 @@ class stock_move(osv.osv):
 
         res = []
 
-        for move in self.browse(cr, uid, ids):
+        for move in self.browse(cr, uid, ids, context=context):
             if split_by_qty <= 0 or quantity == 0:
                 return res
 
@@ -2228,7 +2233,7 @@ class stock_move(osv.osv):
                 self.write(cr, uid, [current_move], update_val)
         return res
 
-    def action_consume(self, cr, uid, ids, quantity, location_id=False,  context=None):
+    def action_consume(self, cr, uid, ids, quantity, location_id=False, context=None):
         """ Consumed product with specific quatity from specific source location
         @param cr: the database cursor
         @param uid: the user id
@@ -2312,7 +2317,7 @@ class stock_move(osv.osv):
         uom_obj = self.pool.get('product.uom')
         wf_service = netsvc.LocalService("workflow")
 
-        if  context is None:
+        if context is None:
             context = {}
 
         complete, too_many, too_few = [], [], []
@@ -2460,7 +2465,7 @@ class stock_inventory(osv.osv):
         product_context = dict(context, compute_child=False)
 
         location_obj = self.pool.get('stock.location')
-        for inv in self.browse(cr, uid, ids):
+        for inv in self.browse(cr, uid, ids, context=context):
             move_ids = []
             for line in inv.inventory_line_id:
                 pid = line.product_id.id
@@ -2505,7 +2510,7 @@ class stock_inventory(osv.osv):
         """ Cancels the stock move and change inventory state to draft.
         @return: True
         """
-        for inv in self.browse(cr, uid, ids):
+        for inv in self.browse(cr, uid, ids, context=context):
             self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
             self.write(cr, uid, [inv.id], {'state': 'draft'})
         return True
@@ -2514,7 +2519,7 @@ class stock_inventory(osv.osv):
         """ Cancels both stock move and inventory
         @return: True
         """
-        for inv in self.browse(cr,uid,ids):
+        for inv in self.browse(cr, uid, ids, context=context):
             self.pool.get('stock.move').action_cancel(cr, uid, [x.id for x in inv.move_ids], context)
             self.write(cr, uid, [inv.id], {'state':'cancel'})
         return True
diff --git a/addons/stock/wizard/stock_change_standard_price.py b/addons/stock/wizard/stock_change_standard_price.py
index ecbaef57a36..198b067ac79 100644
--- a/addons/stock/wizard/stock_change_standard_price.py
+++ b/addons/stock/wizard/stock_change_standard_price.py
@@ -37,7 +37,7 @@ class change_standard_price(osv.osv_memory):
         'enable_stock_in_out_acc':fields.boolean('Enable Related Account',),
     }
 
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
          @param self: The object pointer.
          @param cr: A database cursor
@@ -46,6 +46,8 @@ class change_standard_price(osv.osv_memory):
          @param context: A standard dictionary
          @return: A dictionary which of fields with values.
         """
+        if context is None:
+            context = {}
         product_pool = self.pool.get('product.product')
         product_obj = product_pool.browse(cr, uid, context.get('active_id', False))
         res = super(change_standard_price, self).default_get(cr, uid, fields, context=context)
@@ -67,7 +69,7 @@ class change_standard_price(osv.osv_memory):
 
         return res
 
-    def onchange_price(self, cr, uid, ids, new_price, context = {}):
+    def onchange_price(self, cr, uid, ids, new_price, context=None):
         """ Sets stock input and output account according to the difference
             of old price and new price.
         @param self: The object pointer.
@@ -78,7 +80,9 @@ class change_standard_price(osv.osv_memory):
         @param context: A standard dictionary
         @return: Dictionary of values
         """
-        product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False))
+        if context is None:
+            context = {}
+        product_obj = self.pool.get('product.product').browse(cr, uid, context.get('active_id', False), context=context)
         price = product_obj.standard_price
         diff = price - new_price
         if diff > 0 :
@@ -86,7 +90,7 @@ class change_standard_price(osv.osv_memory):
         else :
             return {'value' : {'enable_stock_in_out_acc':False}}
 
-    def change_price(self, cr, uid, ids, context):
+    def change_price(self, cr, uid, ids, context=None):
         """ Changes the Standard Price of Product.
             And creates an account move accordingly.
         @param self: The object pointer.
@@ -96,10 +100,12 @@ class change_standard_price(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context is None:
+            context = {}
         rec_id = context and context.get('active_id', False)
         assert rec_id, _('Active ID is not set in Context')
         prod_obj = self.pool.get('product.product')
-        res = self.browse(cr, uid, ids)
+        res = self.browse(cr, uid, ids, context=context)
         datas = {
             'new_price' : res[0].new_price,
             'stock_output_account' : res[0].stock_account_output.id,
diff --git a/addons/stock/wizard/stock_fill_inventory.py b/addons/stock/wizard/stock_fill_inventory.py
index 83bfdaf9a4c..8b686cbb619 100644
--- a/addons/stock/wizard/stock_fill_inventory.py
+++ b/addons/stock/wizard/stock_fill_inventory.py
@@ -57,8 +57,8 @@ class stock_fill_inventory(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
-        if context==None:
-            context={}        
+        if context is None:
+            context = {}        
         inventory_line_obj = self.pool.get('stock.inventory.line')
         location_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')
@@ -67,7 +67,7 @@ class stock_fill_inventory(osv.osv_memory):
             ids = ids[0]
         else:
              return {}    
-        fill_inventory = self.browse(cr, uid, ids)
+        fill_inventory = self.browse(cr, uid, ids, context=context)
         res = {}
         res_location = {}
         if fill_inventory.recursive :
@@ -86,7 +86,7 @@ class stock_fill_inventory(osv.osv_memory):
         for location in res_location.keys():
             res = res_location[location]
             for product_id in res.keys():
-                prod = product_obj.browse(cr, uid, [product_id])[0]
+                prod = product_obj.browse(cr, uid, product_id, context=context)
                 uom = prod.uom_id.id
                 context.update(uom=uom, compute_child=False)
                 amount = stock_location_obj._product_get(cr, uid,
diff --git a/addons/stock/wizard/stock_inventory_line_split.py b/addons/stock/wizard/stock_inventory_line_split.py
index 86a42d6da04..11a6a2da323 100644
--- a/addons/stock/wizard/stock_inventory_line_split.py
+++ b/addons/stock/wizard/stock_inventory_line_split.py
@@ -30,7 +30,7 @@ class stock_inventory_line_split(osv.osv_memory):
     _description = "Split inventory lines"
 
     
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ To check the availability of production lot. 
         @param self: The object pointer.
         @param cr: A database cursor
@@ -39,9 +39,11 @@ class stock_inventory_line_split(osv.osv_memory):
         @param context: A standard dictionary 
         @return: A dictionary which of fields with values. 
         """        
+        if context is None:
+            context = {}
         record_id = context and context.get('active_id',False)
         res = {}
-        line = self.pool.get('stock.inventory.line').browse(cr, uid, record_id)        
+        line = self.pool.get('stock.inventory.line').browse(cr, uid, record_id, context=context)        
         if 'product_id' in fields:
             res.update({'product_id':line.product_id.id})
         if 'product_uom' in fields:
@@ -64,8 +66,8 @@ class stock_inventory_line_split(osv.osv_memory):
         ir_sequence_obj = self.pool.get('ir.sequence')
         line_obj = self.pool.get('stock.inventory.line')
         new_line = []        
-        for data in self.browse(cr, uid, ids):
-            for inv_line in line_obj.browse(cr, uid, line_ids):
+        for data in self.browse(cr, uid, ids, context=context):
+            for inv_line in line_obj.browse(cr, uid, line_ids, context=context):
                 line_qty = inv_line.product_qty
                 quantity_rest = inv_line.product_qty                
                 new_line = []   
diff --git a/addons/stock/wizard/stock_inventory_merge.py b/addons/stock/wizard/stock_inventory_merge.py
index cbb9f380cb1..f5ca234d66f 100644
--- a/addons/stock/wizard/stock_inventory_merge.py
+++ b/addons/stock/wizard/stock_inventory_merge.py
@@ -36,7 +36,7 @@ class stock_inventory_merge(osv.osv_memory):
          @param context: A standard dictionary 
          @return: New arch of view.
         """
-        if not context:
+        if context is None:
             context={}
         res = super(stock_inventory_merge, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar,submenu=False)
         if context.get('active_model','') == 'stock.inventory' and len(context['active_ids']) < 2:
@@ -44,7 +44,7 @@ class stock_inventory_merge(osv.osv_memory):
             _('Please select multiple physical inventories to merge in the list view.'))
         return res    
         
-    def do_merge(self, cr, uid, ids, context):
+    def do_merge(self, cr, uid, ids, context=None):
         """ To merge selected Inventories.
         @param self: The object pointer.
         @param cr: A database cursor
@@ -56,6 +56,8 @@ class stock_inventory_merge(osv.osv_memory):
         invent_obj = self.pool.get('stock.inventory')
         invent_line_obj = self.pool.get('stock.inventory.line')
         invent_lines = {}
+        if context is None:
+            context = {}
         for inventory in invent_obj.browse(cr, uid, context['active_ids'], context=context):
             if inventory.state == "done":
                 raise osv.except_osv(_('Warning'),
diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py
index 237f7f8ee28..091049b5689 100644
--- a/addons/stock/wizard/stock_invoice_onshipping.py
+++ b/addons/stock/wizard/stock_invoice_onshipping.py
@@ -76,7 +76,7 @@ class stock_invoice_onshipping(osv.osv_memory):
         pick_obj = self.pool.get('stock.picking')
         count = 0
         active_ids = context.get('active_ids',[])
-        for pick in pick_obj.browse(cr, uid, active_ids):
+        for pick in pick_obj.browse(cr, uid, active_ids, context=context):
             if pick.invoice_state != '2binvoiced':
                 count += 1
         if len(active_ids) == 1 and count:
diff --git a/addons/stock/wizard/stock_location_product.py b/addons/stock/wizard/stock_location_product.py
index 9fe800bb0fe..5ac4aa0f944 100644
--- a/addons/stock/wizard/stock_location_product.py
+++ b/addons/stock/wizard/stock_location_product.py
@@ -29,7 +29,7 @@ class stock_location_product(osv.osv_memory):
         'to_date': fields.datetime('To'), 
     }
 
-    def action_open_window(self, cr, uid, ids, context):
+    def action_open_window(self, cr, uid, ids, context=None):
         """ To open location wise product information specific to given duration
          @param self: The object pointer.
          @param cr: A database cursor
diff --git a/addons/stock/wizard/stock_move.py b/addons/stock/wizard/stock_move.py
index c10a0e63ec3..d43b03b1c5a 100644
--- a/addons/stock/wizard/stock_move.py
+++ b/addons/stock/wizard/stock_move.py
@@ -34,7 +34,7 @@ class stock_move_track(osv.osv_memory):
         'quantity': lambda *x: 1
     }
 
-    def track_lines(self, cr, uid, ids, context={}):
+    def track_lines(self, cr, uid, ids, context=None):
         """ To track stock moves lines
         @param self: The object pointer.
         @param cr: A database cursor
@@ -70,6 +70,8 @@ class stock_move_consume(osv.osv_memory):
         @param context: A standard dictionary
         @return: default values of fields
         """
+        if context is None:
+            context = {}
         res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         if 'product_id' in fields:
@@ -83,7 +85,7 @@ class stock_move_consume(osv.osv_memory):
 
         return res
 
-    def do_move_consume(self, cr, uid, ids, context={}):
+    def do_move_consume(self, cr, uid, ids, context=None):
         """ To move consumed products
         @param self: The object pointer.
         @param cr: A database cursor
@@ -92,6 +94,8 @@ class stock_move_consume(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
@@ -121,6 +125,8 @@ class stock_move_scrap(osv.osv_memory):
         @param context: A standard dictionary
         @return: default values of fields
         """
+        if context is None:
+            context = {}
         res = super(stock_move_consume, self).default_get(cr, uid, fields, context=context)
         move = self.pool.get('stock.move').browse(cr, uid, context['active_id'], context=context)
         location_obj = self.pool.get('stock.location')
@@ -140,7 +146,7 @@ class stock_move_scrap(osv.osv_memory):
 
         return res
 
-    def move_scrap(self, cr, uid, ids, context={}):
+    def move_scrap(self, cr, uid, ids, context=None):
         """ To move scrapped products
         @param self: The object pointer.
         @param cr: A database cursor
@@ -149,6 +155,8 @@ class stock_move_scrap(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
         move_ids = context['active_ids']
         for data in self.read(cr, uid, ids):
@@ -173,6 +181,8 @@ class split_in_production_lot(osv.osv_memory):
         @param context: A standard dictionary
         @return: Default values of fields
         """
+        if context is None:
+            context = {}
 
         res = super(split_in_production_lot, self).default_get(cr, uid, fields, context=context)
         if context.get('active_id'):
@@ -205,6 +215,8 @@ class split_in_production_lot(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context is None:
+            context = {}
         self.split(cr, uid, ids, context.get('active_ids'), context=context)
         return {}
 
@@ -226,7 +238,7 @@ class split_in_production_lot(osv.osv_memory):
         move_obj = self.pool.get('stock.move')
         new_move = []
         for data in self.browse(cr, uid, ids, context=context):
-            for move in move_obj.browse(cr, uid, move_ids):
+            for move in move_obj.browse(cr, uid, move_ids, context=context):
                 move_qty = move.product_qty
                 quantity_rest = move.product_qty
                 uos_qty_rest = move.product_uos_qty
diff --git a/addons/stock/wizard/stock_partial_move.py b/addons/stock/wizard/stock_partial_move.py
index ba39f172f22..edd079315f3 100644
--- a/addons/stock/wizard/stock_partial_move.py
+++ b/addons/stock/wizard/stock_partial_move.py
@@ -51,9 +51,9 @@ class stock_partial_move(osv.osv_memory):
         res = super(stock_partial_move, self).view_init(cr, uid, fields_list, context=context)
         move_obj = self.pool.get('stock.move')
     
-        if not context:
+        if context is None:
             context = {}
-        for move in move_obj.browse(cr, uid, context.get('active_ids', [])):
+        for move in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if move.state in ('done', 'cancel'):
                 raise osv.except_osv(_('Invalid action !'), _('Cannot deliver products which are already delivered !'))
             
@@ -77,11 +77,11 @@ class stock_partial_move(osv.osv_memory):
 
     def __get_active_stock_moves(self, cr, uid, context=None):
         move_obj = self.pool.get('stock.move')
-        if not context:
+        if context is None:
             context = {}
                
         res = []
-        for move in move_obj.browse(cr, uid, context.get('active_ids', [])):
+        for move in move_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             if move.state in ('done', 'cancel'):
                 continue           
             res.append(self.__create_partial_move_memory(move))
@@ -141,7 +141,7 @@ class stock_partial_move(osv.osv_memory):
         result['fields'] = _moves_fields
         return result
    
-    def do_partial(self, cr, uid, ids, context):
+    def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done.
         @param self: The object pointer.
         @param cr: A database cursor
@@ -151,11 +151,12 @@ class stock_partial_move(osv.osv_memory):
         @return: A dictionary which of fields with values.
         """
     
-
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
         
         move_ids = context.get('active_ids', False)
-        partial = self.browse(cr, uid, ids[0], context)
+        partial = self.browse(cr, uid, ids[0], context=context)
         partial_datas = {
             'delivery_date' : partial.date
         }
@@ -165,7 +166,7 @@ class stock_partial_move(osv.osv_memory):
             p_moves[product_move.move_id.id] = product_move
             
         moves_ids_final = []
-        for move in move_obj.browse(cr, uid, move_ids):
+        for move in move_obj.browse(cr, uid, move_ids, context=context):
             if move.state in ('done', 'cancel'):
                 continue
             if not p_moves.get(move.id, False):
diff --git a/addons/stock/wizard/stock_partial_picking.py b/addons/stock/wizard/stock_partial_picking.py
index 6b3b130b0dc..60e2750db08 100644
--- a/addons/stock/wizard/stock_partial_picking.py
+++ b/addons/stock/wizard/stock_partial_picking.py
@@ -33,9 +33,9 @@ class stock_partial_picking(osv.osv_memory):
     def view_init(self, cr, uid, fields_list, context=None):
         res = super(stock_partial_picking, self).view_init(cr, uid, fields_list, context=context)
         pick_obj = self.pool.get('stock.picking')
-        if not context:
+        if context is None:
             context={}
-        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
@@ -157,14 +157,13 @@ class stock_partial_picking(osv.osv_memory):
         @param context: A standard dictionary
         @return: A dictionary which of fields with values.
         """
-
         res = super(stock_partial_picking, self).default_get(cr, uid, fields, context=context)
         pick_obj = self.pool.get('stock.picking')
-        if not context:
+        if context is None:
             context={}
         if 'date' in fields:
             res.update({'date': time.strftime('%Y-%m-%d %H:%M:%S')})
-        for pick in pick_obj.browse(cr, uid, context.get('active_ids', [])):
+        for pick in pick_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
@@ -188,7 +187,7 @@ class stock_partial_picking(osv.osv_memory):
                         res['move%s_product_currency'%(m.id)] = currency
         return res
 
-    def do_partial(self, cr, uid, ids, context):
+    def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done.
         @param self: The object pointer.
         @param cr: A database cursor
@@ -199,11 +198,11 @@ class stock_partial_picking(osv.osv_memory):
         """
         pick_obj = self.pool.get('stock.picking')
         picking_ids = context.get('active_ids', False)
-        partial = self.browse(cr, uid, ids[0], context)
+        partial = self.browse(cr, uid, ids[0], context=context)
         partial_datas = {
             'delivery_date' : partial.date
         }
-        for pick in pick_obj.browse(cr, uid, picking_ids):
+        for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
             need_product_cost = (pick.type == 'in')
             for m in pick.move_lines:
                 if m.state in ('done', 'cancel'):
diff --git a/addons/stock/wizard/stock_replacement.py b/addons/stock/wizard/stock_replacement.py
index 130f2469d45..17f4d5a62ab 100644
--- a/addons/stock/wizard/stock_replacement.py
+++ b/addons/stock/wizard/stock_replacement.py
@@ -30,10 +30,10 @@ class stock_replacement(osv.osv_memory):
     _name = "stock.replacement"
     _description = "Stock Replacement"
 
-    def get_composant(self, cr, uid, ids, context = {}):
+    def get_composant(self, cr, uid, ids, context=None):
         return {}
 
-    def replace_composant(self, cr, uid, ids, context = {}):
+    def replace_composant(self, cr, uid, ids, context=None):
         """ To open a new wizard that acknowledge, a replacement task
         @return: It returns the replacement acknowledgement form
         """
diff --git a/addons/stock/wizard/stock_return_picking.py b/addons/stock/wizard/stock_return_picking.py
index 663370983df..023db6e3ebc 100644
--- a/addons/stock/wizard/stock_return_picking.py
+++ b/addons/stock/wizard/stock_return_picking.py
@@ -29,7 +29,7 @@ class stock_return_picking(osv.osv_memory):
     _name = 'stock.return.picking'
     _description = 'Return Picking'
 
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """
          To get default values for the object.
          @param self: The object pointer.
@@ -39,10 +39,12 @@ class stock_return_picking(osv.osv_memory):
          @param context: A standard dictionary
          @return: A dictionary with default values for all field in ``fields``
         """
+        if context is None:
+            context = {}
         res = super(stock_return_picking, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
-        pick = pick_obj.browse(cr, uid, record_id)
+        pick = pick_obj.browse(cr, uid, record_id, context=context)
         if pick:
             if 'invoice_state' in fields:
                 if pick.invoice_state=='invoiced':
@@ -64,11 +66,13 @@ class stock_return_picking(osv.osv_memory):
          @param context: A standard dictionary 
          @return: New arch of view with new columns.
         """
+        if context is None:
+            context = {}
         res = super(stock_return_picking, self).view_init(cr, uid, fields_list, context=context)
         record_id = context and context.get('active_id', False) 
         if record_id:
             pick_obj = self.pool.get('stock.picking')
-            pick = pick_obj.browse(cr, uid, record_id)
+            pick = pick_obj.browse(cr, uid, record_id, context=context)
             if pick.state not in ['done','confirmed','assigned']:
                 raise osv.except_osv(_('Warning !'), _("You may only return pickings that are Confirmed, Available or Done!"))
             return_history = {}
@@ -128,7 +132,7 @@ class stock_return_picking(osv.osv_memory):
             res['arch'] = '\n'.join(arch_lst)
         return res
 
-    def create_returns(self, cr, uid, ids, context):
+    def create_returns(self, cr, uid, ids, context=None):
         """ 
          Creates return picking.
          @param self: The object pointer.
@@ -137,14 +141,16 @@ class stock_return_picking(osv.osv_memory):
          @param ids: List of ids selected 
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
-        """ 
+        """
+        if context is None:
+            context = {} 
         record_id = context and context.get('active_id', False) or False
         move_obj = self.pool.get('stock.move')
         pick_obj = self.pool.get('stock.picking')
         uom_obj = self.pool.get('product.uom')
         wf_service = netsvc.LocalService("workflow")
     
-        pick = pick_obj.browse(cr, uid, record_id)
+        pick = pick_obj.browse(cr, uid, record_id, context=context)
         data = self.read(cr, uid, ids[0])
         new_picking = None
         date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
diff --git a/addons/stock/wizard/stock_split_move.py b/addons/stock/wizard/stock_split_move.py
index 92262648272..276133b3a01 100644
--- a/addons/stock/wizard/stock_split_move.py
+++ b/addons/stock/wizard/stock_split_move.py
@@ -25,7 +25,7 @@ class stock_split_move_line(osv.osv_memory):
     _name = 'stock.move.line.split'
     _description = "Split Moves"
     
-    def default_get(self, cr, uid, fields, context):
+    def default_get(self, cr, uid, fields, context=None):
         """ To get default values for the object.
          @param self: The object pointer.
          @param cr: A database cursor
@@ -34,6 +34,8 @@ class stock_split_move_line(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """ 
+        if context is None:
+            context = {}
         res = super(stock_split_move_line, self).default_get(cr, uid, fields, context=context)
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
@@ -90,7 +92,7 @@ class stock_split_move_line(osv.osv_memory):
         res['arch'] = '\n'.join(arch_lst)
         return res
     
-    def split_lines(self, cr, uid, ids, context):
+    def split_lines(self, cr, uid, ids, context=None):
         """ Splits moves in quantity given in the wizard.
          @param self: The object pointer.
          @param cr: A database cursor
@@ -99,6 +101,8 @@ class stock_split_move_line(osv.osv_memory):
          @param context: A standard dictionary 
          @return: A dictionary which of fields with values. 
         """ 
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
         record_id = context and context.get('active_id', False) or False
         pick_obj = self.pool.get('stock.picking')
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index 171d7dd1e14..2d4631f3ebf 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -42,8 +42,8 @@ class stock_split_into(osv.osv_memory):
         move_obj = self.pool.get('stock.move')
         track_obj = self.pool.get('stock.tracking')
         inventory_obj = self.pool.get('stock.inventory')
-        quantity = self.browse(cr, uid, data[0], context).quantity or 0.0
-        for move in move_obj.browse(cr, uid, rec_id):
+        quantity = self.browse(cr, uid, data[0], context=context).quantity or 0.0
+        for move in move_obj.browse(cr, uid, rec_id, context=context):
             quantity_rest = move.product_qty - quantity
             #if move.tracking_id :
             #    raise osv.except_osv(_('Error!'),  _('The current move line is already assigned to a pack, please remove it first if you really want to change it ' \
diff --git a/addons/stock/wizard/stock_traceability.py b/addons/stock/wizard/stock_traceability.py
index 815f90810ed..44026c22679 100644
--- a/addons/stock/wizard/stock_traceability.py
+++ b/addons/stock/wizard/stock_traceability.py
@@ -29,7 +29,7 @@ class action_traceability(osv.osv_memory):
     _name = "action.traceability"
     _description = "Action traceability "
      
-    def action_traceability(self, cr, uid, ids, context={}):
+    def action_traceability(self, cr, uid, ids, context=None):
         """ It traces the information of a product
         @param self: The object pointer.
         @param cr: A database cursor
@@ -38,7 +38,8 @@ class action_traceability(osv.osv_memory):
         @param context: A standard dictionary 
         @return: A dictionary of values
         """
-
+        if context is None:
+            context = {}
         type1 = context['type'] or 'move_history_ids2'
         field = context['field'] or 'tracking_id'
         obj = self.pool.get('stock.move')
diff --git a/addons/stock/wizard/stock_ups.py b/addons/stock/wizard/stock_ups.py
index 2f2315027a6..9ba61d06977 100644
--- a/addons/stock/wizard/stock_ups.py
+++ b/addons/stock/wizard/stock_ups.py
@@ -27,7 +27,7 @@ class stock_ups(osv.osv_memory):
     _name = "stock.ups"
     _description = "Stock ups"
 
-    def ups_save(self, cr, uid, ids, context = {}):
+    def ups_save(self, cr, uid, ids, context=None):
         return {
             'name': False,
             'view_type': 'form',
@@ -37,7 +37,7 @@ class stock_ups(osv.osv_memory):
             'target':'new',
         }
 
-    def ups_upload(self, cr, uid, ids, context = {}):
+    def ups_upload(self, cr, uid, ids, context=None):
         return {
             'name': False,
             'view_type': 'form',
@@ -60,7 +60,7 @@ class stock_ups_final(osv.osv_memory):
     _name = "stock.ups.final"
     _description = "Stock ups final"
 
-    def create_xmlfile(self, cr, uid, ids, context = {}):
+    def create_xmlfile(self, cr, uid, ids, context=None):
         """ Creates xml report file.
         @return: xml file
         """
@@ -79,7 +79,7 @@ class stock_ups_upload(osv.osv_memory):
     _name = "stock.ups.upload"
     _description = "Stock ups upload"
 
-    def upload_xmlfile(self, cr, uid, ids, context = {}):
+    def upload_xmlfile(self, cr, uid, ids, context=None):
         """ Uploads xml report file.
         @return: 
         """
diff --git a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
index bf6fecf1d28..ff07645632f 100644
--- a/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
+++ b/addons/stock_invoice_directly/i18n/stock_invoice_directly.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:35+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:35+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:25+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:25+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/stock_invoice_directly/wizard/stock_invoice.py b/addons/stock_invoice_directly/wizard/stock_invoice.py
index 84a24ebb6fe..def35742b99 100644
--- a/addons/stock_invoice_directly/wizard/stock_invoice.py
+++ b/addons/stock_invoice_directly/wizard/stock_invoice.py
@@ -24,7 +24,7 @@ from osv import fields, osv
 class invoice_directly(osv.osv_memory):
     _inherit = 'stock.partial.picking'
 
-    def do_partial(self, cr, uid, ids, context):
+    def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done and 
             launches Create invoice wizard if invoice state is To be Invoiced.
         @param self: The object pointer.
@@ -33,10 +33,12 @@ class invoice_directly(osv.osv_memory):
         @param context: A standard dictionary
         @return:
         """
+        if context is None:
+            context = {}
         result = super(invoice_directly, self).do_partial(cr, uid, ids, context)
         pick_obj = self.pool.get('stock.picking')
         picking_ids = context.get('active_ids', False)
-        pick = pick_obj.browse(cr, uid, picking_ids, context)[0]
+        pick = pick_obj.browse(cr, uid, picking_ids, context=context)[0]
         if pick.invoice_state == '2binvoiced':
             return {
                 'name': 'Create Invoice',
diff --git a/addons/stock_location/i18n/stock_location.pot b/addons/stock_location/i18n/stock_location.pot
index 8cfc3b9a74f..fd549c60525 100644
--- a/addons/stock_location/i18n/stock_location.pot
+++ b/addons/stock_location/i18n/stock_location.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:36+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:36+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:26+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/stock_location/procurement_pull.py b/addons/stock_location/procurement_pull.py
index 31316bf4eae..7122e5ccd12 100644
--- a/addons/stock_location/procurement_pull.py
+++ b/addons/stock_location/procurement_pull.py
@@ -25,21 +25,21 @@ from tools.translate import _
 class procurement_order(osv.osv):
     _inherit = 'procurement.order'
     def check_buy(self, cr, uid, ids, context=None):
-        for procurement in self.browse(cr, uid, ids):
+        for procurement in self.browse(cr, uid, ids, context=context):
             for line in procurement.product_id.flow_pull_ids:
                 if line.location_id==procurement.location_id:
                     return line.type_proc=='buy'
         return super(procurement_order, self).check_buy(cr, uid, ids)
 
     def check_produce(self, cr, uid, ids, context=None):
-        for procurement in self.browse(cr, uid, ids):
+        for procurement in self.browse(cr, uid, ids, context=context):
             for line in procurement.product_id.flow_pull_ids:
                 if line.location_id==procurement.location_id:
                     return line.type_proc=='produce'
         return super(procurement_order, self).check_produce(cr, uid, ids)
 
     def check_move(self, cr, uid, ids, context=None):
-        for procurement in self.browse(cr, uid, ids):
+        for procurement in self.browse(cr, uid, ids, context=context):
             for line in procurement.product_id.flow_pull_ids:
                 if line.location_id==procurement.location_id:
                     return (line.type_proc=='move') and (line.location_src_id)
diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py
index 1f6d7b78e61..56cba807628 100644
--- a/addons/stock_location/stock_location.py
+++ b/addons/stock_location/stock_location.py
@@ -106,7 +106,7 @@ class stock_move(osv.osv):
     _columns = {
         'cancel_cascade': fields.boolean('Cancel Cascade', help='If checked, when this move is cancelled, cancel the linked move too')
     }
-    def action_cancel(self,cr,uid,ids,context={ }):
+    def action_cancel(self, cr, uid, ids, context=None):
         for m in self.browse(cr, uid, ids, context=context):
             if m.cancel_cascade and m.move_dest_id:
                 self.action_cancel(cr, uid, [m.move_dest_id.id], context=context)
@@ -116,7 +116,7 @@ stock_move()
 
 class stock_location(osv.osv):
     _inherit = 'stock.location'
-    def chained_location_get(self, cr, uid, location, partner=None, product=None, context={}):
+    def chained_location_get(self, cr, uid, location, partner=None, product=None, context=None):
         if product:
             for path in product.path_ids:
                 if path.location_from_id.id == location.id:
diff --git a/addons/stock_no_autopicking/i18n/fr.po b/addons/stock_no_autopicking/i18n/fr.po
index 61c79c0eda1..866a835bec4 100644
--- a/addons/stock_no_autopicking/i18n/fr.po
+++ b/addons/stock_no_autopicking/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:46+0000\n"
+"PO-Revision-Date: 2010-12-15 21:08+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:27+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -41,7 +41,7 @@ msgstr ""
 #. module: stock_no_autopicking
 #: constraint:product.product:0
 msgid "Error: Invalid ean code"
-msgstr ""
+msgstr "Erreur : Code ean invalide"
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
@@ -51,7 +51,7 @@ msgstr "Stock sans prélèvement automatique"
 #. module: stock_no_autopicking
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "La quantité à produire ne peut être ni négative ni nulle !"
 
 #~ msgid "Invalid XML for View Architecture!"
 #~ msgstr "XML non valide pour l'architecture de la vue"
diff --git a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
index 3f6571f4f40..9c764d80524 100644
--- a/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
+++ b/addons/stock_no_autopicking/i18n/stock_no_autopicking.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:36+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:36+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:26+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:26+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/stock_planning/i18n/es.po b/addons/stock_planning/i18n/es.po
new file mode 100644
index 00000000000..6fe0b3680a6
--- /dev/null
+++ b/addons/stock_planning/i18n/es.po
@@ -0,0 +1,1441 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-12-03 15:44+0000\n"
+"PO-Revision-Date: 2010-12-15 23:24+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#, python-format
+msgid ""
+"No forecasts for selected period or no products in selected category !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_only:0
+msgid ""
+"Check to calculate stock location of selected warehouse only. If not "
+"selected calculation is made for input, stock and output location of "
+"warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,maximum_op:0
+msgid "Maximum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_company:0
+msgid "This Copmany Period1"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_amt:0
+msgid ""
+"Forecast value which will be converted to Product Quantity according to "
+"prices."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Incoming Left must be greater than 0 !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_before:0
+msgid ""
+"Planned Out in periods before calculated. Between start date of current "
+"period and one day before start of calculated period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#, python-format
+msgid "No products in selected category !"
+msgstr "¡No hay productos en la categoría seleccionada!"
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,warehouse_id:0
+msgid ""
+"Warehouse which forecasts will concern. If during stock planning you will "
+"need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_left:0
+msgid "Expected Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid " "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_left:0
+msgid "Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Requisition history"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Create Forecasts Lines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing:0
+msgid "Quantity of all confirmed outgoing moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Daily Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,company_id:0
+#: field:stock.planning.createlines,company_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,company_id:0
+#: field:stock.sale.forecast.createlines,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Initial Stock: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,warehouse_forecast:0
+msgid ""
+"All sales forecasts for selected Warehouse of selected Product during "
+"selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_creatlines
+msgid "Create Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Minimum Stock Rule Indicators"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,period_id:0
+msgid "Period which forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_only:0
+msgid "Stock Location Only"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_out:0
+msgid ""
+"Quantity which is already dispatched out of this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,procure_to_stock:0
+msgid ""
+"Chect to make procurement to stock location of selected warehouse. If not "
+"selected procurement will be made into input location of warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Current Period Situation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Monthly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,supply_warehouse_id:0
+msgid ""
+"Warehouse used as source in supply pick move created by 'Supply from Another "
+"Warhouse'."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period_createlines
+msgid "stock.period.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing_before:0
+msgid "Planned Out Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,forecasted_products:0
+msgid "All Products with Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Periods :"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,already_in:0
+msgid ""
+"Quantity which is already picked up to this warehouse in current period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Confirmed In Before: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Stock and Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast
+msgid "stock.sale.forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_dept_id:0
+msgid "This Department"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,to_procure:0
+msgid "Planned In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_simulation:0
+msgid "Stock Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning_createlines
+msgid "stock.planning.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_before:0
+msgid ""
+"Confirmed incoming in periods before calculated (Including Already In). "
+"Between start date of current period and one day before start of calculated "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Search  Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_user:0
+msgid "This User Period5"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,history:0
+msgid "History of procurement or internal supply of this planning line."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,company_forecast:0
+msgid ""
+"All sales forecasts for whole company (for all Warehouses) of selected "
+"Product during selected Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_user:0
+msgid "This User Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_user:0
+msgid "This User Period3"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_main
+#: view:stock.planning:0
+msgid "Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,minimum_op:0
+msgid "Minimum Rule"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Procure Incoming Left"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Incoming Left: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Pick List "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Create"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_planning_form
+#: model:ir.module.module,shortdesc:stock_planning.module_meta_information
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning
+#: view:stock.planning:0
+msgid "Master Procurement Schedule"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "  Creation Date: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,period_id:0
+#: field:stock.planning.createlines,period_id:0
+#: field:stock.sale.forecast,period_id:0
+#: field:stock.sale.forecast.createlines,period_id:0
+msgid "Period"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: field:stock.period,state:0
+#: field:stock.planning,state:0
+#: field:stock.sale.forecast,state:0
+msgid "State"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category of products which created forecasts will concern."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_period
+msgid "stock period"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
+msgid "stock.sale.forecast.createlines"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_id:0
+#: field:stock.planning.createlines,warehouse_id:0
+#: field:stock.sale.forecast,warehouse_id:0
+#: field:stock.sale.forecast.createlines,warehouse_id:0
+msgid "Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_simulation:0
+msgid ""
+"Stock simulation at the end of selected Period.\n"
+" For current period it is: \n"
+"Initial Stock - Already Out + Already In - Expected Out + Incoming Left.\n"
+"For periods ahead it is: \n"
+"Initial Stock - Planned Out Before + Incoming Before - Planned Out + Planned "
+"In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,analyze_company:0
+msgid "Check this box to see the sales for whole company."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,name:0
+msgid "Name"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Search Stock Planning"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming_before:0
+msgid "Incoming Before"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning.createlines,product_categ_id:0
+#: field:stock.sale.forecast.createlines,product_categ_id:0
+msgid "Product Category"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#: code:addons/stock_planning/wizard/stock_planning_createlines.py:0
+#: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Manual planning for "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_user_id:0
+msgid "This User"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Confirmed Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Supply from Another Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculate Planning"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Procurement created in MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Invalid action !"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_start:0
+msgid "Stock quantity one day before current period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create Weekly Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,maximum_op:0
+msgid "Maximum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "You must specify a Source Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+msgid "Creates planning lines for selected period and warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_user:0
+msgid "This User Period4"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Note: Doesn't duplicate existing lines created by you."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Stock and Sales Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,company_forecast:0
+msgid "Company Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_uom:0
+#: help:stock.sale.forecast,product_uom:0
+msgid ""
+"Unit of Measure used to show the quanities of stock calculation.You can use "
+"units form default category or from second category (UoS category)."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per User :"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_all
+#: view:stock.sale.forecast:0
+msgid "Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,name:0
+#: field:stock.period.createlines,name:0
+msgid "Period Name"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,user_id:0
+msgid "Created/Validated by"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Internal Supply"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_company:0
+msgid "This Company Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_company:0
+msgid "This Company Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_company:0
+msgid "This Company Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_company:0
+msgid "This Company Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_start:0
+#: field:stock.period.createlines,date_start:0
+msgid "Start Date"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_user:0
+msgid "This User Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,confirmed_forecasts_only:0
+msgid "Validated Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,product_categ_id:0
+msgid ""
+"Planning will be created for products from Product Category selected by this "
+"field. This field is ignored when you check \"All Forecasted Product\" box."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,planned_outgoing:0
+msgid "Planned Out"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Department :"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.period,state:0
+#: selection:stock.planning,state:0
+#: selection:stock.sale.forecast,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Closed"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: view:stock.sale.forecast:0
+msgid "Warehouse "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Expected Out: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Create periods for Stock and Sales Planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,planned_outgoing:0
+msgid ""
+"Enter planned outgoing quantity from selected Warehouse during the selected "
+"Period of selected Product. To plan this value look at Confirmed Out or "
+"Sales Forecasts. This value should be equal or greater than Confirmed Out."
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.module.module,description:stock_planning.module_meta_information
+msgid ""
+"\n"
+"This module is based on original OpenERP SA module stock_planning version "
+"1.0 of the same name Master Procurement Schedule.\n"
+"\n"
+"Purpose of MPS is to allow create a manual procurement (requisition) apart "
+"of MRP scheduler (which works automatically on minimum stock rules).\n"
+"\n"
+"Terms used in the module:\n"
+"- Stock and Sales Period - is the time (between Start Date and End Date) for "
+"which you plan Stock and Sales Forecast and make Procurement Planning. \n"
+"- Stock and Sales Forecast - is the quantity of products you plan to sell in "
+"the Period.\n"
+"- Stock Planning - is the quantity of products you plan to purchase or "
+"produce for the Period.\n"
+"\n"
+"Because we have another module sale_forecast which uses terms \"Sales "
+"Forecast\" and \"Planning\" as amount values we will use terms \"Stock and "
+"Sales Forecast\" and \"Stock Planning\" to emphasize that we use quantity "
+"values. \n"
+"\n"
+"Activity with this module is divided to three steps:\n"
+"- Creating Periods. Mandatory step.\n"
+"- Creating Sale Forecasts and entering quantities to them. Optional step but "
+"useful for further planning.\n"
+"- Creating Planning lines, entering quantities to them and making "
+"Procurement. Making procurement is the final step for the Period.\n"
+"\n"
+"Periods\n"
+"=======\n"
+"You have two menu items for Periods in \"Sales Management - Configuration\". "
+"There are:\n"
+"- \"Create Sales Periods\" - Which automates creating daily, weekly or "
+"monthly periods.\n"
+"- \"Stock and sales Periods\" - Which allows to create any type of periods, "
+"change the dates and change the State of period.\n"
+"\n"
+"Creating periods is the first step you have to do to use modules features. "
+"You can create custom periods using \"New\" button in \"Stock and Sales "
+"Periods\" form or view but it is recommended to use automating tool.\n"
+"\n"
+"Remarks:\n"
+"- These periods (officially Stock and Sales Periods) are separated of "
+"Financial or other periods in the system.\n"
+"- Periods are not assigned to companies (when you use multicompany feature "
+"at all). Module suppose that you use the same periods across companies. If "
+"you wish to use different periods for different companies define them as you "
+"wish (they can overlap). Later on in this text will be indications how to "
+"use such periods.\n"
+"- When periods are created automatically their start and finish dates are "
+"with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily "
+"periods they will have start date 31.01.2010 00:00:00 and end date "
+"31.01.2010 23:59:00. It works only in automatic creation of periods. When "
+"you create periods manually you have to take care about hours because you "
+"can have incorrect values form sales or stock. \n"
+"- If you use overlapping periods for the same product, warehouse and company "
+"results can be unpredictable.\n"
+"- If current date doesn't belong to any period or you have holes between "
+"periods results can be unpredictable.\n"
+"\n"
+"Sales Forecasts\n"
+"===============\n"
+"You have few menus for Sales forecast in \"Sales Management - Sales "
+"Forecasts\".\n"
+"- \"Create Sales Forecasts for Sales Periods\" - which automates creating "
+"forecasts lines according to some parameters.\n"
+"- \"Sales Forecasts\" - few menus for working with forecasts lists and "
+"forms.\n"
+"\n"
+"Menu \"Create Sales Forecasts for Sales Periods\" creates Forecasts for "
+"products from selected Category, for selected Period and for selected "
+"Warehouse. It is an option \"Copy Last Forecast\" to copy forecast and other "
+"settings of period before this one to created one.\n"
+"\n"
+"Remarks:\n"
+"- This tool doesn't create lines, if relevant lines (for the same Product, "
+"Period, Warehouse and validated or created by you) already exists. If you "
+"wish to create another forecast, if relevant lines exists you have to do it "
+"manually using menus described bellow.\n"
+"- When created lines are validated by someone else you can use this tool to "
+"create another lines for the same Period, Product and Warehouse. \n"
+"- When you choose \"Copy Last Forecast\" created line takes quantity and "
+"some settings from your (validated by you or created by you if not validated "
+"yet) forecast which is for last period before period of created forecast. If "
+"there are few your forecasts for period before this one (it is possible) "
+"system takes one of them (no rule which of them).\n"
+"\n"
+"\n"
+"Menus \"Sales Forecasts\"\n"
+"On \"Sales Forecast\" form mainly you have to enter a forecast quantity in "
+"\"Product Quantity\". Further calculation can work for draft forecasts. But "
+"validation can save your data against any accidental changes. You can click "
+"\"Validate\" button but it is not mandatory.\n"
+"\n"
+"Instead of forecast quantity you can enter amount of forecast sales in field "
+"\"Product Amount\". System will count quantity from amount according to Sale "
+"price of the Product.\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"To find proper value for Sale Forecast you can use \"Sales History\" table "
+"for this product. You have to enter parameters to the top and left of this "
+"table and system will count sale quantities according to these parameters. "
+"So you can select fe. your department (at the top) then (to the left): last "
+"period, period before last and period year ago.\n"
+"\n"
+"Remarks:\n"
+"\n"
+"\n"
+"Procurement Planning\n"
+"====================\n"
+"Menu for Planning you can find in \"Warehouse - Stock Planning\".\n"
+"- \"Create Stock Planning Lines\" - allows you to automate creating planning "
+"lines according to some parameters.\n"
+"- \"Master Procurement Scheduler\" - is the most important menu of the "
+"module which allows to create procurement.\n"
+"\n"
+"As Sales forecast is phase of planning sales. The Procurement Planning "
+"(Planning) is the phase of scheduling Purchasing or Producing. You can "
+"create Procurement Planning quickly using tool from menu \"Create Stock "
+"Planning Lines\", then you can review created planning and make procurement "
+"using menu \"Master Procurement Schedule\".\n"
+"\n"
+"Menu \"Create Stock Planning Lines\" allows you to create quickly Planning "
+"lines for products from selected Category, for selected Period, and for "
+"selected Warehouse. When you check option \"All Products with Forecast\" "
+"system creates lines for all products having forecast for selected Period "
+"and Warehouse. Selected Category will be ignored in this case.\n"
+"\n"
+"Under menu \"Master Procurement Scheduler\" you can generally change the "
+"values \"Planned Out\" and \"Planned In\" to observe the field \"Stock "
+"Simulation\" and decide if this value would be accurate for end of the "
+"Period. \n"
+"\"Planned Out\" can be based on \"Warehouse Forecast\" which is the sum of "
+"all forecasts for Period and Warehouse. But your planning can be based on "
+"any other information you have. It is not necessary to have any forecast. \n"
+"\"Planned In\" quantity is used to calculate field \"Incoming Left\" which "
+"is the quantity to be procured to make stock as indicated in \"Stock "
+"Simulation\" at the end of Period. You can compare \"Stock Simulation\" "
+"quantity to minimum stock rules visible on the form. But you can plan "
+"different quantity than in Minimum Stock Rules. Calculation is made for "
+"whole Warehouse by default. But if you want to see values for Stock location "
+"of calculated warehouse you can use check box \"Stock Location Only\".\n"
+"\n"
+"If after few tries you decide that you found correct quantities for "
+"\"Planned Out\" and \"Planned In\" and you are satisfied with end of period "
+"stock calculated in \"Stock Simulation\" you can click \"Procure Incoming "
+"Left\" button to procure quantity of field \"Incoming Left\" into the "
+"Warehouse. System creates appropriate Procurement Order. You can decide if "
+"procurement will be made to Stock or Input location of calculated Warehouse. "
+"\n"
+"\n"
+"If you don't want to Produce or Buy the product but just pick calculated "
+"quantity from another warehouse you can click \"Supply from Another "
+"Warehouse\" (instead of \"Procure Incoming Left\"). System creates pick list "
+"with move from selected source Warehouse to calculated Warehouse (as "
+"destination). You can also decide if this pick should be done from Stock or "
+"Output location of source warehouse. Destination location (Stock or Input) "
+"of destination warehouse will be used as set for \"Procure Incoming Left\". "
+"\n"
+"\n"
+"To see proper quantities in fields \"Confirmed In\", \"Confirmed Out\", "
+"\"Confirmed In Before\", \"Planned Out Before\" and \"Stock Simulation\" you "
+"have to click button \"Calculate Planning\".\n"
+"\n"
+"All values on the form are expressed in unit of measure selected on form. "
+"You can select one of unit of measure from default category or from second "
+"category. When you change unit of measure the quanities will be recalculated "
+"according to new UoM: editable values (blue fields) immediately, non edited "
+"fields after clicking of \"Calculate Planning\" button.\n"
+"\n"
+"How Stock Simulation field is calculated:\n"
+"Generally Stock Simulation shows the stock for end of the calculated period "
+"according to some planned or confirmed stock moves. Calculation always "
+"starts with quantity of real stock of beginning of current period. Then "
+"calculation adds or subtracts quantities of calculated period or periods "
+"before calculated.\n"
+"When you are in the same period (current period is the same as calculated) "
+"Stock Simulation is calculated as follows:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out \n"
+"\t+ Planned In\n"
+"\n"
+"When you calculate period next to current:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period\n"
+"\t- Planned Out of current Period \n"
+"\t+ Confirmed In of current Period  (incl. Already In)\n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period .\n"
+"\n"
+"As you see calculated Period is taken the same way like in case above. But "
+"calculation of current Period are made a little bit different. First you "
+"should note that system takes for current Period only Confirmed In moves. It "
+"means that you have to make planning and procurement for current Period "
+"before this calculation (for Period next to current). \n"
+"\n"
+"When you calculate Period ahead:\n"
+"Stock Simulation = \n"
+"\tStock of beginning of current Period \n"
+"\t- Sum of Planned Out of Periods before calculated \n"
+"\t+ Sum of Confirmed In of Periods before calculated (incl. Already In) \n"
+"\t- Planned Out of calculated Period \n"
+"\t+ Planned In of calculated Period.\n"
+"\n"
+"Periods before calculated means periods starting from current till period "
+"before calculated.\n"
+"\n"
+"Remarks:\n"
+"- Remember to make planning for all periods before calculated because "
+"omitting these quantities and procurements can cause wrong suggestions for "
+"procurements few periods ahead.\n"
+"- If you made planning few periods ahead and you find that real Confirmed "
+"Out is bigger than Planned Out in some periods before you can repeat "
+"Planning and make another procurement. You should do it in the same planning "
+"line. If you create another planning line the suggestions can be wrong.\n"
+"- When you wish to work with different periods for some part of products "
+"define two kinds of periods (fe. Weekly and Monthly) and use them for "
+"different products. Example: If you use always Weekly periods for Products "
+"A, and Monthly periods for Products B your all calculations will work "
+"correctly. You can also use different kind of periods for the same products "
+"from different warehouse or companies. But you cannot use overlapping "
+"periods for the same product, warehouse and company because results can be "
+"unpredictable. The same apply to Forecasts lines.\n"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Cannot delete Validated Sale Forecasts !"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out: "
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"You must specify a Source Warehouse different than calculated (destination) "
+"Warehouse !"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_sale_forecast_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_sale_forecast_createlines
+msgid "Create Sales Forecasts"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast.createlines:0
+msgid "Creates forecast lines for selected warehouse and period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Requisition ("
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,outgoing_left:0
+msgid ""
+"Quantity expected to go out in selected period. As a difference between "
+"Planned Out and Confirmed Out. For current period Already Out is also "
+"calculated"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_id:0
+msgid "Period4"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Already In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_id:0
+msgid "Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_id:0
+msgid "Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_id:0
+msgid "Period1"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Minimum stock: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,active_uom:0
+#: field:stock.sale.forecast,active_uom:0
+msgid "Active UoM"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_planning_createlines
+#: view:stock.planning.createlines:0
+msgid "Create Stock Planning Lines"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "General Info"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
+msgid "Sales Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Planning and Situation for Calculated Period"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_warehouse:0
+msgid "This Warehouse Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,warehouse_forecast:0
+msgid "Warehouse Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Confirmed In: "
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Sales history"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,supply_warehouse_id:0
+msgid "Source Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_qty:0
+msgid "Forecasted quantity."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Stock"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_supply_location:0
+msgid "Stock Supply Location"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_stop:0
+msgid "Ending date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,forecasted_products:0
+msgid ""
+"Check this box to create planning for all products having any forecast for "
+"selected Warehouse and Period. Product Category field will be ignored."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_in:0
+msgid "Already In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom_categ:0
+#: field:stock.planning,product_uos_categ:0
+#: field:stock.sale.forecast,product_uom_categ:0
+msgid "Product UoM Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,incoming:0
+msgid "Confirmed In"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,line_time:0
+msgid "Past/Future"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uos_categ:0
+msgid "Product UoS Category"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_qty:0
+msgid "Product Quantity"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy Last Forecast"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,product_id:0
+msgid "Shows which product this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: selection:stock.planning,state:0
+msgid "Done"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period.createlines,period_ids:0
+msgid "Periods"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid " according to state:"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period.createlines:0
+msgid "Cancel"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+#: view:stock.planning.createlines:0
+#: view:stock.sale.forecast.createlines:0
+msgid "Close"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+#: selection:stock.sale.forecast,state:0
+msgid "Validated"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+#: selection:stock.period,state:0
+msgid "Open"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast.createlines,copy_forecast:0
+msgid "Copy quantities from last Stock and Sale Forecast."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period1_per_dept:0
+msgid "This Dept Period1"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_dept:0
+msgid "This Dept Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_dept:0
+msgid "This Dept Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_dept:0
+msgid "This Dept Period5"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_dept:0
+msgid "This Dept Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period2_per_warehouse:0
+msgid "This Warehouse Period2"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period3_per_warehouse:0
+msgid "This Warehouse Period3"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,outgoing:0
+msgid "Confirmed Out"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,create_uid:0
+msgid "Responsible"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Default UOM"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
+msgid "This Warehouse Period4"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_per_warehouse:0
+msgid "This Warehouse Period5"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.period:0
+msgid "Current"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.model,name:stock_planning.model_stock_planning
+msgid "stock.planning"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,warehouse_id:0
+msgid ""
+"Shows which warehouse this forecast concerns. If during stock planning you "
+"will need sales forecast for all warehouses choose any warehouse now."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,warehouse_id:0
+msgid "Warehouse which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Stock Simulation: "
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,to_procure:0
+msgid ""
+"Enter quantity which (by your plan) should come in. Change this value and "
+"observe Stock simulation. This value should be equal or greater than "
+"Confirmed In."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning.createlines,period_id:0
+msgid "Period which planning will concern."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,already_out:0
+msgid "Already Out"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,product_id:0
+msgid "Product which this planning is created for."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Per Warehouse :"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Warehouse Forecast: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,history:0
+msgid "Procurement History"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.period.createlines,date_start:0
+msgid "Starting date for planning period."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "    Planned In: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyze_company:0
+msgid "Per Company"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming_left:0
+msgid ""
+"Quantity left to Planned incoming quantity. This is calculated difference "
+"between Planned In and Confirmed In. For current period Already In is also "
+"calculated. This value is used to create procurement for lacking quantity."
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,incoming:0
+msgid "Quantity of all confirmed incoming moves in calculated Period."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.period,date_stop:0
+#: field:stock.period.createlines,date_stop:0
+msgid "End Date"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,stock_supply_location:0
+msgid ""
+"Check to supply from Stock location of Supply Warehouse. If not checked "
+"supply will be made from Output location of Supply Warehouse. Used in "
+"'Supply from Another Warhouse' with Supply Warehouse."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "No Requisition"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,minimum_op:0
+msgid "Minimum quantity set in Minimum Stock Rules for this Warhouse"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,period_id:0
+msgid "Shows which period this forecast concerns."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,product_uom:0
+msgid "UoM"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+msgid "Calculated Period Simulation"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.planning:0
+#: field:stock.planning,product_id:0
+#: view:stock.sale.forecast:0
+#: field:stock.sale.forecast,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+"For period: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "MPS("
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid "Pick created from MPS by user: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,procure_to_stock:0
+msgid "Procure To Stock Location"
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Approve"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,period_id:0
+msgid ""
+"Period for this planning. Requisition will be created for beginning of the "
+"period."
+msgstr ""
+
+#. module: stock_planning
+#: view:stock.sale.forecast:0
+msgid "Calculate Sales History"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,product_amt:0
+msgid "Product Amount"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.planning,confirmed_forecasts_only:0
+msgid ""
+"Check to take validated forecasts only. If not checked system takes "
+"validated and draft forecasts."
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_period5_id:0
+msgid "Period5"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
+msgid "Stock and Sales Planning Periods"
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.sale.forecast,analyzed_warehouse_id:0
+msgid "This Warehouse"
+msgstr ""
+
+#. module: stock_planning
+#: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period
+#: model:ir.ui.menu,name:stock_planning.menu_stock_period_main
+#: view:stock.period:0
+#: view:stock.period.createlines:0
+msgid "Stock and Sales Periods"
+msgstr ""
+
+#. module: stock_planning
+#: help:stock.sale.forecast,user_id:0
+msgid "Shows who created this forecast, or who validated."
+msgstr ""
+
+#. module: stock_planning
+#: code:addons/stock_planning/stock_planning.py:0
+#, python-format
+msgid ""
+"\n"
+" Planned Out Before: "
+msgstr ""
+
+#. module: stock_planning
+#: field:stock.planning,stock_start:0
+msgid "Initial Stock"
+msgstr ""
diff --git a/addons/stock_planning/i18n/stock_planning.pot b/addons/stock_planning/i18n/stock_planning.pot
index 64e6f02e7f9..bdd9e0e34c2 100644
--- a/addons/stock_planning/i18n/stock_planning.pot
+++ b/addons/stock_planning/i18n/stock_planning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:37+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:37+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:27+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py
index 546e83e0053..9fdd94c909d 100644
--- a/addons/stock_planning/stock_planning.py
+++ b/addons/stock_planning/stock_planning.py
@@ -47,11 +47,11 @@ class stock_period(osv.osv):
         'state': 'draft'
     }
     
-    def button_open(self, cr, uid, ids, context):
+    def button_open(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'open'})
         return True
     
-    def button_close(self, cr, uid, ids, context):
+    def button_close(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state': 'close'})
         return True
 
@@ -192,17 +192,17 @@ class stock_sale_forecast(osv.osv):
     def _to_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
         uom_obj = self.pool.get('product.uom')
         product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id)
+        product = product_obj.browse(cr, uid, product_id, context=context)
         uom = uom_obj.browse(cr, uid, uom_id, context=context)
         coef = uom.factor
         if uom.category_id.id <> product.uom_id.category_id.id:
             coef = coef / product.uos_coeff
         return product.uom_id.factor / coef
 
-    def _from_default_uom_factor(self, cr, uid, product_id, uom_id, context):
+    def _from_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
         uom_obj = self.pool.get('product.uom')
         product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id)
+        product = product_obj.browse(cr, uid, product_id, context=context)
         uom = uom_obj.browse(cr, uid, uom_id, context=context)
         res = uom.factor
         if uom.category_id.id <> product.uom_id.category_id.id:
@@ -231,7 +231,7 @@ class stock_sale_forecast(osv.osv):
 
     def calculate_sales_history(self, cr, uid, ids, context, *args):
         sales = [[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],[0,0,0,0],]
-        for obj in self.browse(cr, uid, ids):
+        for obj in self.browse(cr, uid, ids, context=context):
             periods = obj.analyzed_period1_id, obj.analyzed_period2_id, obj.analyzed_period3_id, obj.analyzed_period4_id, obj.analyzed_period5_id
             so_obj = self.pool.get('sale.order')
             so_line_obj = self.pool.get('sale.order.line')
@@ -302,7 +302,7 @@ class stock_planning(osv.osv):
     _name = "stock.planning"
 
     def _get_in_out(self, cr, uid, val, date_start, date_stop, direction, done, context=None):
-        if not context:
+        if context is None:
             context = {}
         product_obj = self.pool.get('product.product')
         mapping = {'in': {
@@ -346,7 +346,7 @@ class stock_planning(osv.osv):
         res = self._to_planning_uom(cr, uid, val, planning_qtys, context)
         return res
 
-    def _to_planning_uom(self, cr, uid, val, qtys, context):
+    def _to_planning_uom(self, cr, uid, val, qtys, context=None):
         res_qty = 0
         if qtys:
             uom_obj = self.pool.get('product.uom')
@@ -360,7 +360,7 @@ class stock_planning(osv.osv):
 
     def _get_forecast(self, cr, uid, ids, field_names, arg, context=None):
         res = {}
-        for val in self.browse(cr, uid, ids):
+        for val in self.browse(cr, uid, ids, context=context):
             res[val.id] = {}
             valid_part = val.confirmed_forecasts_only and " AND state = 'validated'" or ""
             cr.execute('SELECT sum(product_qty), product_uom  \
@@ -382,6 +382,8 @@ class stock_planning(osv.osv):
         return res
 
     def _get_stock_start(self, cr, uid, val, date, context=None):
+        if context is None:
+            context = {}
         context['from_date'] = None
         context['to_date'] = date
         locations = [val.warehouse_id.lot_stock_id.id,]
@@ -393,7 +395,7 @@ class stock_planning(osv.osv):
         res = product_obj['qty_available']     # value for stock_start
         return res
 
-    def _get_past_future(self, cr, uid, ids, field_names, arg, context):
+    def _get_past_future(self, cr, uid, ids, field_names, arg, context=None):
         res = {}
         for val in self.browse(cr, uid, ids, context=context):
             if val.period_id.date_stop < time.strftime('%Y-%m-%d'):
@@ -519,7 +521,7 @@ class stock_planning(osv.osv):
     def _to_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
         uom_obj = self.pool.get('product.uom')
         product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id)
+        product = product_obj.browse(cr, uid, product_id, context=context)
         uom = uom_obj.browse(cr, uid, uom_id, context=context)
         coef = uom.factor
         if uom.category_id.id != product.uom_id.category_id.id:
@@ -530,7 +532,7 @@ class stock_planning(osv.osv):
     def _from_default_uom_factor(self, cr, uid, product_id, uom_id, context=None):
         uom_obj = self.pool.get('product.uom')
         product_obj = self.pool.get('product.product')
-        product = product_obj.browse(cr, uid, product_id)
+        product = product_obj.browse(cr, uid, product_id, context=context)
         uom = uom_obj.browse(cr, uid, uom_id, context=context)
         res = uom.factor
         if uom.category_id.id != product.uom_id.category_id.id:
@@ -592,7 +594,7 @@ class stock_planning(osv.osv):
 # so if UoM is from UoM category it is used as UoM in standard and if product has UoS the UoS will be calcualated.
 # If UoM is from UoS category it is recalculated to basic UoS from product (in planning you can use any UoS from UoS category)
 # and basic UoM is calculated.
-    def _qty_to_standard(self, cr, uid, val, context):
+    def _qty_to_standard(self, cr, uid, val, context=None):
         uos = False
         uos_qty = 0.0
         if val.product_uom.category_id.id == val.product_id.uom_id.category_id.id:
@@ -614,11 +616,11 @@ class stock_planning(osv.osv):
         return uom_qty, uom, uos_qty, uos
 
     def procure_incomming_left(self, cr, uid, ids, context, *args):
-        for obj in self.browse(cr, uid, ids):
+        for obj in self.browse(cr, uid, ids, context=context):
             if obj.incoming_left <= 0:
                 raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !'))
             uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
             proc_id = self.pool.get('procurement.order').create(cr, uid, {
                         'company_id' : obj.company_id.id,
                         'name': _('Manual planning for ') + obj.period_id.name,
@@ -656,7 +658,7 @@ class stock_planning(osv.osv):
         return True
 
     def internal_supply(self, cr, uid, ids, context, *args):
-        for obj in self.browse(cr, uid, ids):
+        for obj in self.browse(cr, uid, ids, context=context):
             if obj.incoming_left <= 0:
                 raise osv.except_osv(_('Error !'), _('Incoming Left must be greater than 0 !'))
             if not obj.supply_warehouse_id:
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods.py b/addons/stock_planning/wizard/stock_planning_create_periods.py
index 12e0d56e755..13a822ed3fe 100644
--- a/addons/stock_planning/wizard/stock_planning_create_periods.py
+++ b/addons/stock_planning/wizard/stock_planning_create_periods.py
@@ -53,6 +53,8 @@ class stock_period_createlines(osv.osv_memory):
     }
     
     def create_stock_periods(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         interval = context.get('interval',0)
         name = context.get('name','Daily')
         period_obj = self.pool.get('stock.period')
diff --git a/addons/subscription/i18n/fr.po b/addons/subscription/i18n/fr.po
index d24a52fb3de..7d06e29c4c0 100644
--- a/addons/subscription/i18n/fr.po
+++ b/addons/subscription/i18n/fr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-04 09:27+0000\n"
+"PO-Revision-Date: 2010-12-15 21:08+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -255,6 +255,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription without removing it."
 msgstr ""
+"Si le champ actif est à Faux, vous aurez la possibilité de cacher votre "
+"abonnement sans le supprimer."
 
 #. module: subscription
 #: help:subscription.document.fields,value:0
diff --git a/addons/subscription/i18n/it.po b/addons/subscription/i18n/it.po
index 3f506c7a250..98bbbf9f272 100644
--- a/addons/subscription/i18n/it.po
+++ b/addons/subscription/i18n/it.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-09 09:21+0000\n"
+"PO-Revision-Date: 2010-12-15 15:16+0000\n"
 "Last-Translator: Lorenzo Battistini - agilebg.com "
 "<lorenzo.battistini@agilebg.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 04:42+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -31,12 +31,12 @@ msgstr "Oggetto"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "Questa settimana"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "Cerca abbonamento"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -52,7 +52,7 @@ msgstr "Campo"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
@@ -77,13 +77,13 @@ msgstr "Settimane"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "Oggi"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Errore !"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -112,8 +112,8 @@ msgstr "Impost come Bozza"
 msgid ""
 "Module allows to create new documents and add subscription on that document."
 msgstr ""
-"Il modulo consente di creare nuovi documenti ed aggiungere nuove "
-"sottoscrizioni a questi."
+"Il modulo consente di creare nuovi documenti ed aggiungere abbonamenti a "
+"questi."
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -153,6 +153,8 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
+"Se il campo 'attivo' è deselezionato, sarà possibile nascondere "
+"l'abbonamento senza rimuoverlo."
 
 #. module: subscription
 #: selection:subscription.subscription.history,document_id:0
@@ -172,6 +174,8 @@ msgid ""
 "You cannot modify the Object linked to the Document Type!\n"
 "Create another Document instead !"
 msgstr ""
+"Non è possibile modificare l'oggetto collegato al tipo di documento!\n"
+"Piuttosto crea un altro documento !"
 
 #. module: subscription
 #: field:subscription.document,field_ids:0
@@ -203,7 +207,7 @@ msgstr "Attivo"
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
 msgid "Cron Job"
-msgstr "Sincronizza"
+msgstr "Cron Job"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription
@@ -220,13 +224,13 @@ msgstr "Partner"
 #. module: subscription
 #: help:subscription.subscription,cron_id:0
 msgid "Scheduler which runs on subscription"
-msgstr ""
+msgstr "Pianificatore che esegue sulla base dell'abbonamento"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
 #: model:ir.ui.menu,name:subscription.next_id_45
 msgid "Recurring Events"
-msgstr ""
+msgstr "Eventi ricorrenti"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -236,7 +240,7 @@ msgstr "Dati Abbonamento"
 #. module: subscription
 #: help:subscription.subscription,note:0
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "Descrizione o sommario dell'abbonamento"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
@@ -251,11 +255,15 @@ msgid ""
 "If the active field is set to False, it will allow you to hide the "
 "subscription without removing it."
 msgstr ""
+"Se il campo 'attivo' è deselezionato, sarà possibile nascondere "
+"l'abbonamento senza rimuoverlo."
 
 #. module: subscription
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
 msgstr ""
+"Il valore di default è utilizzato dal campo quando un nuovo documento viene "
+"generato."
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
@@ -265,7 +273,7 @@ msgstr "False"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Group By..."
-msgstr ""
+msgstr "Raggruppa per..."
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -275,13 +283,15 @@ msgstr "Processa"
 #. module: subscription
 #: model:ir.module.module,shortdesc:subscription.module_meta_information
 msgid "Subscription and recurring operations"
-msgstr "Sottoscrizioni ed operazioni ricorsive"
+msgstr "Abbonamento ed operazioni ricorrenti"
 
 #. module: subscription
 #: help:subscription.subscription,doc_source:0
 msgid ""
 "User can choose the source document on which he wants to create documents"
 msgstr ""
+"L'utente può scegliere il documento di origine sul quale vuole creare "
+"documenti"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
diff --git a/addons/subscription/i18n/subscription.pot b/addons/subscription/i18n/subscription.pot
index c3f7a24341c..b0dd8f7986a 100644
--- a/addons/subscription/i18n/subscription.pot
+++ b/addons/subscription/i18n/subscription.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:37+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:37+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:27+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:27+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index 93615483696..4f40ea25c35 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -58,7 +58,7 @@ class subscription_document_fields(osv.osv):
     _defaults = {}
 subscription_document_fields()
 
-def _get_document_types(self, cr, uid, context={}):
+def _get_document_types(self, cr, uid, context=None):
     cr.execute('select m.model, s.name from subscription_document s, ir_model m WHERE s.model = m.id order by s.name')
     return cr.fetchall()
 
@@ -91,8 +91,8 @@ class subscription_subscription(osv.osv):
         'state': lambda *a: 'draft'
     }
 
-    def set_process(self, cr, uid, ids, context={}):
-        for row in self.read(cr, uid, ids):
+    def set_process(self, cr, uid, ids, context=None):
+        for row in self.read(cr, uid, ids, context=context):
             mapping = {'name':'name','interval_number':'interval_number','interval_type':'interval_type','exec_init':'numbercall','date_init':'nextcall'}
             res = {'model':'subscription.subscription', 'args': repr([[row['id']]]), 'function':'model_copy', 'priority':6, 'user_id':row['user_id'] and row['user_id'][0]}
             for key,value in mapping.items():
@@ -101,8 +101,8 @@ class subscription_subscription(osv.osv):
             self.write(cr, uid, [row['id']], {'cron_id':id, 'state':'running'})
         return True
 
-    def model_copy(self, cr, uid, ids, context={}):
-        for row in self.read(cr, uid, ids):
+    def model_copy(self, cr, uid, ids, context=None):
+        for row in self.read(cr, uid, ids, context=context):
             if not row.get('cron_id',False):
                 continue
             cron_ids = [row['cron_id'][0]]
@@ -136,14 +136,14 @@ class subscription_subscription(osv.osv):
             self.write(cr, uid, [row['id']], {'state':state})
         return True
 
-    def set_done(self, cr, uid, ids, context={}):
+    def set_done(self, cr, uid, ids, context=None):
         res = self.read(cr,uid, ids, ['cron_id'])
         ids2 = [x['cron_id'][0] for x in res if x['id']]
         self.pool.get('ir.cron').write(cr, uid, ids2, {'active':False})
         self.write(cr, uid, ids, {'state':'done'})
         return True
 
-    def set_draft(self, cr, uid, ids, context={}):
+    def set_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {'state':'draft'})
         return True
 subscription_subscription()
diff --git a/addons/survey/i18n/fr.po b/addons/survey/i18n/fr.po
index 61720e26619..57bee14d96e 100644
--- a/addons/survey/i18n/fr.po
+++ b/addons/survey/i18n/fr.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-15 04:53+0000\n"
+"PO-Revision-Date: 2010-12-15 23:27+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: survey
diff --git a/addons/survey/i18n/survey.pot b/addons/survey/i18n/survey.pot
index 7a6cdfd85fd..f8578e64f9f 100644
--- a/addons/survey/i18n/survey.pot
+++ b/addons/survey/i18n/survey.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:39+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:39+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:29+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 207355c47c8..47a0a50f821 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -45,7 +45,7 @@ class survey(osv.osv):
     _description = 'Survey'
     _rec_name = 'title'
 
-    def default_get(self, cr, uid, fields, context={}):
+    def default_get(self, cr, uid, fields, context=None):
         data = super(survey, self).default_get(cr, uid, fields, context)
         return data
 
@@ -93,7 +93,7 @@ class survey(osv.osv):
         self.write(cr, uid, ids, {'state': 'cancel' })
         return True
         
-    def copy(self, cr, uid, ids, default=None, context={}):
+    def copy(self, cr, uid, ids, default=None, context=None):
         vals = {}
         current_rec = self.read(cr, uid, ids, context=context)
         title = current_rec.get('title') + ' (Copy)'
@@ -110,7 +110,7 @@ class survey(osv.osv):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for print survey form.
         """
-        if not context:
+        if context is None:
             context = {}
         datas = {}
         if 'response_id' in context:
@@ -176,7 +176,9 @@ class survey_page(osv.osv):
         'sequence': lambda * a: 1
     }
 
-    def default_get(self, cr, uid, fields, context={}):
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
         data = super(survey_page, self).default_get(cr, uid, fields, context)
         if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
@@ -185,7 +187,9 @@ class survey_page(osv.osv):
             data['survey_id'] = context['survey_id']
         return data
 
-    def survey_save(self, cr, uid, ids, context):
+    def survey_save(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
@@ -200,7 +204,7 @@ class survey_page(osv.osv):
             'context': context
         }
 
-    def copy(self, cr, uid, ids, default=None, context={}):
+    def copy(self, cr, uid, ids, default=None, context=None):
         vals = {}
         current_rec = self.read(cr, uid, ids, context=context)
         title = current_rec.get('title') + ' (Copy)'
@@ -215,7 +219,7 @@ class survey_question(osv.osv):
     _rec_name = 'question'
     _order = 'sequence'
 
-    def _calc_response(self, cr, uid, ids, field_name, arg, context):
+    def _calc_response(self, cr, uid, ids, field_name, arg, context=None):
         if len(ids) == 0:
             return {}
         val = {}
@@ -446,7 +450,7 @@ class survey_question(osv.osv):
 
         return super(survey_question, self).write(cr, uid, ids, vals, context=context)
 
-    def create(self, cr, uid, vals, context):
+    def create(self, cr, uid, vals, context=None):
         minimum_ans = 0
         maximum_ans = 0
         if vals.has_key('answer_choice_ids') and  not len(vals['answer_choice_ids']):
@@ -482,7 +486,9 @@ class survey_question(osv.osv):
         res = super(survey_question, self).create(cr, uid, vals, context)
         return res
 
-    def survey_save(self, cr, uid, ids, context):
+    def survey_save(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
         surv_name_wiz = self.pool.get('survey.name.wiz')
@@ -497,7 +503,9 @@ class survey_question(osv.osv):
             'context': context
         }
 
-    def default_get(self, cr, uid, fields, context={}):
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
         data = super(survey_question, self).default_get(cr, uid, fields, context)
         if context.get('line_order',False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
@@ -515,11 +523,15 @@ class survey_question_column_heading(osv.osv):
     _description = 'Survey Question Column Heading'
     _rec_name = 'title'
 
-    def _get_in_visible_rating_weight(self,cr, uid, context={}):
+    def _get_in_visible_rating_weight(self,cr, uid, context=None):
+        if context is None:
+            context = {}
         if context.get('in_visible_rating_weight', False):
             return context['in_visible_rating_weight']
         return False
-    def _get_in_visible_menu_choice(self,cr, uid, context={}):
+    def _get_in_visible_menu_choice(self,cr, uid, context=None):
+        if context is None:
+            context = {}
         if context.get('in_visible_menu_choice', False):
             return context['in_visible_menu_choice']
         return False
@@ -544,9 +556,9 @@ class survey_answer(osv.osv):
     _rec_name = 'answer'
     _order = 'sequence'
 
-    def _calc_response_avg(self, cr, uid, ids, field_name, arg, context):
+    def _calc_response_avg(self, cr, uid, ids, field_name, arg, context=None):
         val = {}
-        for rec in self.browse(cr, uid, ids, context):
+        for rec in self.browse(cr, uid, ids, context=context):
             cr.execute("select count(question_id) ,(select count(answer_id) \
                 from survey_response_answer sra, survey_response_line sa \
                 where sra.response_id = sa.id and sra.answer_id = %d \
@@ -564,7 +576,9 @@ class survey_answer(osv.osv):
             }
         return val
 
-    def _get_in_visible_answer_type(self,cr, uid, context={}):
+    def _get_in_visible_answer_type(self,cr, uid, context=None):
+        if context is None:
+            context = {}
         return context.get('in_visible_answer_type', False)
 
     _columns = {
@@ -585,7 +599,9 @@ class survey_answer(osv.osv):
          'in_visible_answer_type':_get_in_visible_answer_type,
     }
 
-    def default_get(self, cr, uid, fields, context={}):
+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
         data = super(survey_answer, self).default_get(cr, uid, fields, context)
         if context.get('line_order', False):
             if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
@@ -615,14 +631,14 @@ class survey_response(osv.osv):
     def name_get(self, cr, uid, ids, context=None):
         if not len(ids):
             return []
-        reads = self.read(cr, uid, ids, ['user_id','date_create'], context)
+        reads = self.read(cr, uid, ids, ['user_id','date_create'], context=context)
         res = []
         for record in reads:
             name = (record['user_id'] and record['user_id'][1] or '' )+ ' (' + record['date_create'].split('.')[0] + ')'
             res.append((record['id'], name))
         return res
 
-    def copy(self, cr, uid, id, default=None,context={}):
+    def copy(self, cr, uid, id, default=None, context=None):
         raise osv.except_osv(_('Warning !'),_('You cannot duplicate the resource!'))
 
 survey_response()
@@ -723,7 +739,7 @@ class survey_request(osv.osv):
     def on_change_user(self, cr, uid, ids, user_id, context=None):
         if user_id:
             user_obj = self.pool.get('res.users')
-            user = user_obj.browse(cr, uid, user_id)
+            user = user_obj.browse(cr, uid, user_id, context=context)
             return {'value': {'email': user.address_id.email}}
         return {}
 
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index b8a878a506a..90d702f13ed 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -74,10 +74,10 @@ class survey_question_wiz(osv.osv_memory):
                     'response': 0
                 }
                 wiz_id = surv_name_wiz.create(cr, uid, res_data)
-                sur_name_rec = surv_name_wiz.browse(cr, uid, wiz_id)
+                sur_name_rec = surv_name_wiz.browse(cr, uid, wiz_id, context=context)
                 context.update({'sur_name_id' :wiz_id})
             else:
-                sur_name_rec = surv_name_wiz.browse(cr, uid, context['sur_name_id'])
+                sur_name_rec = surv_name_wiz.browse(cr, uid, context['sur_name_id'], context=context)
 
             if context.has_key('active_id'):
                 context.pop('active_id')
@@ -96,7 +96,7 @@ class survey_question_wiz(osv.osv_memory):
                     return super(survey_question_wiz, self).\
                                 fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context,
                                         toolbar=toolbar, submenu=submenu)
-            sur_rec = survey_obj.browse(cr, uid, survey_id)
+            sur_rec = survey_obj.browse(cr, uid, survey_id, context=context)
             p_id = map(lambda x:x.id, sur_rec.page_ids)
             total_pages = len(p_id)
             pre_button = False
@@ -109,7 +109,7 @@ class survey_question_wiz(osv.osv_memory):
             if not sur_name_rec.page_no + 1 :
                 surv_name_wiz.write(cr, uid, [context['sur_name_id'],], {'store_ans':{}})
 
-            sur_name_read = surv_name_wiz.browse(cr, uid, context['sur_name_id'])
+            sur_name_read = surv_name_wiz.browse(cr, uid, context['sur_name_id'], context=context)
             page_number = int(sur_name_rec.page_no)
             if sur_name_read.transfer or not sur_name_rec.page_no + 1:
                 surv_name_wiz.write(cr, uid, [context['sur_name_id']], {'transfer':False})
@@ -149,7 +149,7 @@ class survey_question_wiz(osv.osv_memory):
                     if sur_name_rec.page_no > 1:
                         pre_button = True
                 if flag:
-                    pag_rec = page_obj.browse(cr, uid, p_id)
+                    pag_rec = page_obj.browse(cr, uid, p_id, context=context)
                     xml_form = etree.Element('form', {'string': tools.ustr(pag_rec.title)})
                     xml_group = etree.SubElement(xml_form, 'group', {'col': '1', 'colspan': '4'})
                     if context.has_key('response_id') and context.get('response_id', False) \
@@ -177,7 +177,7 @@ class survey_question_wiz(osv.osv_memory):
 
                     for que in que_ids:
                         qu_no += 1
-                        que_rec = que_obj.browse(cr, uid, que.id)
+                        que_rec = que_obj.browse(cr, uid, que.id, context=context)
                         descriptive_text = ""
                         separator_string = tools.ustr(qu_no) + "." + tools.ustr(que_rec.question)
                         if ((context.has_key('active') and not context.get('active',False)) or not context.has_key('active')) and que_rec.is_require_answer:
@@ -424,7 +424,7 @@ class survey_question_wiz(osv.osv_memory):
                             cr.execute("select email from res_partner_address where id =%s", (resp_id.id,))
                             resp_email = cr.fetchone()[0]
                         if user_email and resp_email:
-                            user_name = user_obj.browse(cr, uid, uid).name
+                            user_name = user_obj.browse(cr, uid, uid, context=context).name
                             mail = "Hello " + survey_data.responsible_id.name + ",\n\n " + str(user_name) + " Give Response Of " + survey_data.title + " Survey.\n\n Thanks,"
                             tools.email_send(user_email, [resp_email], "Survey Answer Of " + str(user_name) , mail, attach = attachments)
 
@@ -479,6 +479,8 @@ class survey_question_wiz(osv.osv_memory):
         @return : Dictionary value for fields list with value.
         """
         value = {}
+        if context is None:
+            context = {}
         for field in fields_list:
             if field.split('_')[0] == 'progress':
                 tot_page_id = self.pool.get('survey').browse(cr, uid, context.get('survey_id',False))
@@ -558,6 +560,7 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : True.
         """
+        if context is None: context = {}
         if context.has_key('active') and context.get('active',False):
             return True
 
@@ -1006,7 +1009,7 @@ class survey_question_wiz(osv.osv_memory):
 
         return True
 
-    def action_new_question(self,cr, uid, ids, context):
+    def action_new_question(self,cr, uid, ids, context=None):
         """
         New survey.Question form.
 
@@ -1017,6 +1020,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open new survey.Qestion form.
         """
+        if context is None:
+            context = {}
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1032,7 +1037,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_new_page(self, cr, uid, ids, context):
+    def action_new_page(self, cr, uid, ids, context=None):
         """
         New survey.Page form.
 
@@ -1043,6 +1048,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open new survey.page form.
         """
+        if context is None:
+            context = {}
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1058,7 +1065,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_edit_page(self,cr, uid, ids, context):
+    def action_edit_page(self,cr, uid, ids, context=None):
         """
         Edit survey.page.
 
@@ -1069,6 +1076,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open Edit survey.page form.
         """
+        if context is None:
+            context = {}
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1085,7 +1094,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_delete_page(self,cr, uid, ids, context):
+    def action_delete_page(self,cr, uid, ids, context=None):
         """
         Delete survey.page.
 
@@ -1096,6 +1105,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open next survey.page form, but delete the selected page.
         """
+        if context is None:
+            context = {}
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1116,7 +1127,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_edit_question(self,cr, uid, ids, context):
+    def action_edit_question(self,cr, uid, ids, context=None):
         """
         Edit survey.question.
 
@@ -1127,6 +1138,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open Edit survey.question form.
         """
+        if context is None:
+            context = {}
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1143,7 +1156,7 @@ class survey_question_wiz(osv.osv_memory):
             'context': context
         }
 
-    def action_delete_question(self,cr, uid, ids, context):
+    def action_delete_question(self,cr, uid, ids, context=None):
         """
         Delete survey.question.
 
@@ -1154,6 +1167,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open same survey.page form, but delete the selected survey.question in current survey.page.
         """
+        if context is None:
+            context = {}
         for key,val in context.items():
             if type(key) == type(True):
                 context.pop(key)
@@ -1186,6 +1201,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open Previous Answer form.
         """
+        if context is None:
+            context = {}
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),\
@@ -1216,6 +1233,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open Next Answer form.
         """
+        if context is None:
+            context = {}
         search_obj = self.pool.get('ir.ui.view')
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),\
@@ -1246,6 +1265,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open Next survey.page form.
         """
+        if context is None:
+            context = {}
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),('name','=','Survey Search')])
@@ -1271,6 +1292,8 @@ class survey_question_wiz(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for Open Previous survey.page form.
         """
+        if context is None:
+            context = {}
         surv_name_wiz = self.pool.get('survey.name.wiz')
         search_obj = self.pool.get('ir.ui.view')
         search_id = search_obj.search(cr,uid,[('model','=','survey.question.wiz'),\
diff --git a/addons/survey/wizard/survey_browse_answer.py b/addons/survey/wizard/survey_browse_answer.py
index b3ddba7ecd7..52664eb48cc 100644
--- a/addons/survey/wizard/survey_browse_answer.py
+++ b/addons/survey/wizard/survey_browse_answer.py
@@ -60,6 +60,7 @@ class survey_browse_answer(osv.osv_memory):
         @param context: A standard dictionary for contextual values,
         @return : Dictionary value for Open the browse answer wizard.
         """
+        if context is None: context = {}
         record = self.read(cr, uid, ids, [])
         record = record and record[0] or {} 
         if record['response_id']:
diff --git a/addons/survey/wizard/survey_print_answer.py b/addons/survey/wizard/survey_print_answer.py
index e634a64c7a0..8375868e9db 100644
--- a/addons/survey/wizard/survey_print_answer.py
+++ b/addons/survey/wizard/survey_print_answer.py
@@ -55,6 +55,8 @@ class survey_print_answer(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return : Dictionary value for created survey answer report
         """
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['response_ids', 'orientation', 'paper_size',\
                              'page_number', 'without_pagebreak'], context)
diff --git a/addons/survey/wizard/survey_print_statistics.py b/addons/survey/wizard/survey_print_statistics.py
index 57221e180da..9c10d138e0e 100644
--- a/addons/survey/wizard/survey_print_statistics.py
+++ b/addons/survey/wizard/survey_print_statistics.py
@@ -41,6 +41,8 @@ class survey_print_statistics(osv.osv_memory):
         @param context: A standard dictionary for contextual values
         @return: Dictionary value for created survey statistics report
         """
+        if context is None:
+            context = {}
         datas = {'ids': context.get('active_ids', [])}
         res = self.read(cr, uid, ids, ['survey_ids'], context)
         res = res and res[0] or {}
diff --git a/addons/survey/wizard/survey_selection.py b/addons/survey/wizard/survey_selection.py
index 0b504a71aed..04b829077f3 100644
--- a/addons/survey/wizard/survey_selection.py
+++ b/addons/survey/wizard/survey_selection.py
@@ -120,6 +120,7 @@ class survey_name_wiz(osv.osv_memory):
         """
         survey_obj = self.pool.get('survey')
         search_obj = self.pool.get('ir.ui.view')
+        if context is None: context = {}
 
         sur_id = self.read(cr, uid, ids, [])[0]
         survey_id = sur_id['survey_id']
diff --git a/addons/survey/wizard/survey_send_invitation.py b/addons/survey/wizard/survey_send_invitation.py
index 62be63dc755..361f7388f6f 100644
--- a/addons/survey/wizard/survey_send_invitation.py
+++ b/addons/survey/wizard/survey_send_invitation.py
@@ -60,11 +60,13 @@ class survey_send_invitation(osv.osv_memory):
         return ''.join([choice(chars) for i in range(6)])
 
     def default_get(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         data = super(survey_send_invitation, self).default_get(cr, uid, fields_list, context)
         survey_obj = self.pool.get('survey')
         msg = ""
         name = ""
-        for sur in survey_obj.browse(cr, uid, context.get('active_ids', [])):
+        for sur in survey_obj.browse(cr, uid, context.get('active_ids', []), context=context):
             name += "\t --> " + sur.title + "\n"
             if sur.state != 'open':
                 msg +=  sur.title + "\n"
@@ -92,6 +94,8 @@ class survey_send_invitation(osv.osv_memory):
 
 
     def action_send(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         record = self.read(cr, uid, ids, [])
         survey_ids =  context.get('active_ids', [])
         record = record and record[0]
@@ -220,6 +224,8 @@ class survey_send_invitation_log(osv.osv_memory):
     }
 
     def default_get(self, cr, uid, fields_list, context=None):
+        if context is None:
+            context = {}
         data = super(survey_send_invitation_log, self).default_get(cr, uid, fields_list, context)
         data['note'] = context.get('note', '')
         return data
diff --git a/addons/thunderbird/i18n/fr.po b/addons/thunderbird/i18n/fr.po
index 4fa8c54aad6..6c995ab80cf 100644
--- a/addons/thunderbird/i18n/fr.po
+++ b/addons/thunderbird/i18n/fr.po
@@ -8,20 +8,21 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 21:16+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-15 21:14+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
 msgid "Thunderbird Plug-In Configuration"
-msgstr ""
+msgstr "Configuration du module pour Thunderbird"
 
 #. module: thunderbird
 #: field:thunderbird.installer,pdf_file:0
@@ -72,7 +73,7 @@ msgstr "Module pour Thunderbird"
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Fermer"
 
 #. module: thunderbird
 #: help:thunderbird.installer,thunderbird:0
@@ -80,22 +81,25 @@ msgid ""
 "Allows you to select an object that you’d like to add to your email and its "
 "attachments."
 msgstr ""
+"Vous permet de sélectionner un objet que vous souhaitez ajouter à votre "
+"courriel et ses pièces jointes."
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
 #: field:thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr ""
+msgstr "Module pour Thunderbird"
 
 #. module: thunderbird
 #: help:thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
 msgstr ""
+"Fichier de la documentation : comment installer le module pour Thunderbird."
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_email_server_tools
 msgid "Email Server Tools"
-msgstr ""
+msgstr "Outils pour le serveur de courriels"
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
@@ -105,7 +109,7 @@ msgstr "Interface Thunderbird"
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Étapes d'installation et de configuration"
 
 #. module: thunderbird
 #: field:thunderbird.installer,config_logo:0
@@ -118,11 +122,13 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
+"Fichier du module pour Thunderbird. Enregistrer ce fichier sur votre "
+"ordinateur et installer ce module dans Thunderbird."
 
 #. module: thunderbird
 #: field:thunderbird.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Avancement de la configuration"
 
 #~ msgid "Copy To"
 #~ msgstr "Copier vers"
diff --git a/addons/thunderbird/i18n/pt.po b/addons/thunderbird/i18n/pt.po
index 252aebbb39c..291299a3b2e 100644
--- a/addons/thunderbird/i18n/pt.po
+++ b/addons/thunderbird/i18n/pt.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 12:14+0000\n"
-"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 23:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/thunderbird.pot b/addons/thunderbird/i18n/thunderbird.pot
index cf7cf6905aa..83d5358d022 100644
--- a/addons/thunderbird/i18n/thunderbird.pot
+++ b/addons/thunderbird/i18n/thunderbird.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:39+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:39+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:29+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,7 @@ msgstr ""
 #. module: thunderbird
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
+#: view:thunderbird.installer:0
 msgid "Thunderbird Plug-In Configuration"
 msgstr ""
 
@@ -46,6 +47,11 @@ msgstr ""
 msgid "title"
 msgstr ""
 
+#. module: thunderbird
+#: help:thunderbird.installer,plugin_file:0
+msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
+msgstr ""
+
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
@@ -64,6 +70,7 @@ msgstr ""
 
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
+#: view:thunderbird.installer:0
 msgid "Thunderbird Plug-In"
 msgstr ""
 
@@ -78,9 +85,8 @@ msgid "Allows you to select an object that you’d like to add to your email and
 msgstr ""
 
 #. module: thunderbird
-#: field:thunderbird.installer,plugin_file:0
-#: field:thunderbird.installer,thunderbird:0
-msgid "Thunderbird Plug-in"
+#: view:thunderbird.installer:0
+msgid "This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one."
 msgstr ""
 
 #. module: thunderbird
@@ -109,8 +115,9 @@ msgid "Image"
 msgstr ""
 
 #. module: thunderbird
-#: help:thunderbird.installer,plugin_file:0
-msgid "Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."
+#: field:thunderbird.installer,plugin_file:0
+#: field:thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
 msgstr ""
 
 #. module: thunderbird
diff --git a/addons/thunderbird/i18n/zh_CN.po b/addons/thunderbird/i18n/zh_CN.po
index a13d41fbd4d..45d13f84498 100644
--- a/addons/thunderbird/i18n/zh_CN.po
+++ b/addons/thunderbird/i18n/zh_CN.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 17:37+0000\n"
-"Last-Translator: Roger Zeng <Unknown>\n"
+"PO-Revision-Date: 2010-12-15 13:07+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index 62664fedccb..e145501fee2 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -31,7 +31,7 @@ class thunderbird_installer(osv.osv_memory):
     _name = 'thunderbird.installer'
     _inherit = 'res.config.installer'
 
-    def default_get(self, cr, uid, fields, context={}):
+    def default_get(self, cr, uid, fields, context=None):
         data = super(thunderbird_installer, self).default_get(cr, uid, fields, context)
         data['pdf_file'] = 'http://doc.openerp.com/book/2/2_6_Comms/2_6_Comms_thunderbird.html'
         file = open(addons.get_module_resource('thunderbird','plugin', 'openerp_plugin.xpi'),'rb')
diff --git a/addons/users_ldap/i18n/users_ldap.pot b/addons/users_ldap/i18n/users_ldap.pot
index fca2b614345..687e6c95346 100644
--- a/addons/users_ldap/i18n/users_ldap.pot
+++ b/addons/users_ldap/i18n/users_ldap.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:40+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:40+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:29+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:29+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/warning/i18n/es.po b/addons/warning/i18n/es.po
index 9851e75b2d7..e9f80d88a96 100644
--- a/addons/warning/i18n/es.po
+++ b/addons/warning/i18n/es.po
@@ -7,14 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-09 08:38+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"<jesteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-15 23:24+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-14 05:31+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -46,7 +45,7 @@ msgstr "Albarán"
 #. module: warning
 #: constraint:account.invoice:0
 msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
+msgstr "Error: Número BVR no válido (checksum erróneo)."
 
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
@@ -180,7 +179,7 @@ msgstr "Módulo para configuración de avisos en eventos"
 #. module: warning
 #: constraint:account.invoice:0
 msgid "Error: BVR reference is required."
-msgstr ""
+msgstr "Error: La referencia BVR es necesaria."
 
 #. module: warning
 #: view:res.partner:0
diff --git a/addons/warning/i18n/fr.po b/addons/warning/i18n/fr.po
index 428229a8d7b..41f28ce278a 100644
--- a/addons/warning/i18n/fr.po
+++ b/addons/warning/i18n/fr.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-10 17:16+0000\n"
-"PO-Revision-Date: 2010-12-14 21:00+0000\n"
-"Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
+"PO-Revision-Date: 2010-12-15 21:14+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:14+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
@@ -200,7 +201,7 @@ msgstr "Avertissement sur les Commandes d'Achat"
 #: code:addons/warning/warning.py:0
 #, python-format
 msgid "Warning for %s"
-msgstr ""
+msgstr "Avertissement pour %s"
 
 #. module: warning
 #: view:res.partner:0
diff --git a/addons/warning/i18n/warning.pot b/addons/warning/i18n/warning.pot
index 6ad41e29e37..fce33a13251 100644
--- a/addons/warning/i18n/warning.pot
+++ b/addons/warning/i18n/warning.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-10 17:16:33+0000\n"
-"PO-Revision-Date: 2010-12-10 17:16:33+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:30+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -41,11 +41,6 @@ msgstr ""
 msgid "Picking List"
 msgstr ""
 
-#. module: warning
-#: constraint:account.invoice:0
-msgid "Error: Invalid Bvr Number (wrong checksum)."
-msgstr ""
-
 #. module: warning
 #: model:ir.model,name:warning.model_sale_order_line
 #: field:product.product,sale_line_warn:0
@@ -126,8 +121,8 @@ msgid "Sale Order"
 msgstr ""
 
 #. module: warning
-#: field:res.partner,picking_warn:0
-msgid "Stock Picking"
+#: field:res.partner,invoice_warn_msg:0
+msgid "Message for Invoice"
 msgstr ""
 
 #. module: warning
@@ -159,8 +154,8 @@ msgid "Selecting the \"Warning\" option will notify user with the message, Selec
 msgstr ""
 
 #. module: warning
-#: field:res.partner,invoice_warn_msg:0
-msgid "Message for Invoice"
+#: field:res.partner,picking_warn:0
+msgid "Stock Picking"
 msgstr ""
 
 #. module: warning
@@ -168,11 +163,6 @@ msgstr ""
 msgid "Module for Warnings form onchange Event."
 msgstr ""
 
-#. module: warning
-#: constraint:account.invoice:0
-msgid "Error: BVR reference is required."
-msgstr ""
-
 #. module: warning
 #: view:res.partner:0
 msgid "Warning on the Picking"
diff --git a/addons/wiki/i18n/fr.po b/addons/wiki/i18n/fr.po
index 953500208d3..7f454bcb991 100644
--- a/addons/wiki/i18n/fr.po
+++ b/addons/wiki/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-12-03 15:44+0000\n"
-"PO-Revision-Date: 2010-12-14 21:11+0000\n"
+"PO-Revision-Date: 2010-12-15 09:36+0000\n"
 "Last-Translator: Quentin THEURET <quentin@theuret.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-12-15 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-12-16 04:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
diff --git a/addons/wiki/i18n/wiki.pot b/addons/wiki/i18n/wiki.pot
index 640900367a8..b86f8f22675 100644
--- a/addons/wiki/i18n/wiki.pot
+++ b/addons/wiki/i18n/wiki.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:41+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:41+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:30+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:30+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 2d814485a7c..f3503936c78 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -54,7 +54,7 @@ class wiki_group(osv.osv):
         'method': lambda *a: 'page',
     }
 
-    def open_wiki_page(self, cr, uid, ids, context):
+    def open_wiki_page(self, cr, uid, ids, context=None):
 
         """ Opens Wiki Page of Group
         @param cr: the current row, from the database cursor,
@@ -62,8 +62,6 @@ class wiki_group(osv.osv):
         @param ids: List of open wiki group’s IDs
         @return: dictionay of open wiki window on give group id
         """
-        if not context:
-            context = {}
         if type(ids) in (int,long,):
             ids = [ids]
         group_id = False
@@ -131,7 +129,7 @@ class wiki_wiki2(osv.osv):
         'minor_edit': lambda *a: True,
     }
 
-    def onchange_group_id(self, cr, uid, ids, group_id, content, context={}):
+    def onchange_group_id(self, cr, uid, ids, group_id, content, context=None):
 
         """ @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
@@ -140,7 +138,7 @@ class wiki_wiki2(osv.osv):
 
         if (not group_id) or content:
             return {}
-        grp = self.pool.get('wiki.groups').browse(cr, uid, group_id)
+        grp = self.pool.get('wiki.groups').browse(cr, uid, group_id, context=context)
         section = '0'
         for page in grp.page_ids:
             if page.section: section = page.section
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index 7cee4f88e96..f95c1e2dffd 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -31,7 +31,7 @@ class wiki_create_menu(osv.osv_memory):
         'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True),
     }
 
-    def wiki_menu_create(self, cr, uid, ids, context):
+    def wiki_menu_create(self, cr, uid, ids, context=None):
 
         """ Create Menu On the base of Group id and Action id
         @param cr: the current row, from the database cursor,
@@ -39,6 +39,8 @@ class wiki_create_menu(osv.osv_memory):
         @param ids: List of create menu’s IDs
 
         """
+        if context is None:
+            context = {}
         obj_wiki_group = self.pool.get('wiki.groups')
         obj_view = self.pool.get('ir.ui.view')
         obj_menu = self.pool.get('ir.ui.menu')
diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py
index 98cc001fe8c..6b159b7ac30 100644
--- a/addons/wiki/wizard/wiki_make_index.py
+++ b/addons/wiki/wizard/wiki_make_index.py
@@ -27,7 +27,7 @@ class wiki_make_index(osv.osv_memory):
     _name = "wiki.make.index"
     _description = "Create Index"
 
-    def wiki_do_index(self, cr, uid, ids, context):
+    def wiki_do_index(self, cr, uid, ids, context=None):
 
         """ Makes Index according to page hierarchy
         @param cr: the current row, from the database cursor,
@@ -35,9 +35,11 @@ class wiki_make_index(osv.osv_memory):
         @param ids: list of wiki index’s IDs
 
         """
+        if context is None:
+            context = {}
         data = context and context.get('active_ids', []) or []
 
-        for index_obj in self.browse(cr, uid, ids):
+        for index_obj in self.browse(cr, uid, ids, context=context):
             wiki_pool = self.pool.get('wiki.wiki')
             cr.execute("Select id, section from wiki_wiki where id IN %s \
                             order by section ", (tuple(data),))
diff --git a/addons/wiki/wizard/wiki_show_diff.py b/addons/wiki/wizard/wiki_show_diff.py
index 43f3f698611..278c91064df 100644
--- a/addons/wiki/wizard/wiki_show_diff.py
+++ b/addons/wiki/wizard/wiki_show_diff.py
@@ -33,6 +33,8 @@ class showdiff(osv.osv_memory):
         """ @param cr: the current row, from the database cursor,
         @param uid: the current user’s ID for security checks,
         """
+        if context is None:
+            context = {}
         history = self.pool.get('wiki.wiki.history')
         ids = context.get('active_ids', [])
 
diff --git a/addons/wiki/wizard/wiki_wiki_page_open.py b/addons/wiki/wizard/wiki_wiki_page_open.py
index 4eafe45cd35..1fe4f8acc49 100644
--- a/addons/wiki/wizard/wiki_wiki_page_open.py
+++ b/addons/wiki/wizard/wiki_wiki_page_open.py
@@ -27,7 +27,7 @@ class wiki_wiki_page_open(osv.osv_memory):
     _name = "wiki.wiki.page.open"
     _description = "wiz open page"
 
-    def open_wiki_page(self, cr, uid, ids, context):
+    def open_wiki_page(self, cr, uid, ids, context=None):
 
         """ Opens Wiki Page of Group
         @param cr: the current row, from the database cursor,
@@ -35,8 +35,10 @@ class wiki_wiki_page_open(osv.osv_memory):
         @param ids: List of open wiki page’s IDs
         @return: dictionay of open wiki window on give group id
         """
+        if context is None:
+            context = {}
         group_ids = context.get('active_ids', [])
-        for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids):
+        for group in self.pool.get('wiki.groups').browse(cr, uid, group_ids, context=context):
             value = {
                 'domain': "[('group_id','=',%d)]" % (group.id),
                 'name': 'Wiki Page',
diff --git a/addons/wiki_faq/i18n/wiki_faq.pot b/addons/wiki_faq/i18n/wiki_faq.pot
index 3d0bf467d51..90a4e1186f9 100644
--- a/addons/wiki_faq/i18n/wiki_faq.pot
+++ b/addons/wiki_faq/i18n/wiki_faq.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:41+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:41+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:31+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
index 7d8b77ad9d8..63e7484304a 100644
--- a/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
+++ b/addons/wiki_quality_manual/i18n/wiki_quality_manual.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:41+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:41+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:31+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
index 3e87c64a1d3..9df32dac9b5 100644
--- a/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
+++ b/addons/wiki_sale_faq/i18n/wiki_sale_faq.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-03 15:44:42+0000\n"
-"PO-Revision-Date: 2010-12-03 15:44:42+0000\n"
+"POT-Creation-Date: 2010-12-15 15:06:31+0000\n"
+"PO-Revision-Date: 2010-12-15 15:06:31+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"